summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2015-06-28 15:00:42 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2015-06-28 15:00:42 +0000
commitb946d61c42568f6579c11361ec5a27f8cb45e1b0 (patch)
tree78d54087a97d5a8db14106e454d74a3fd1f347a0 /sys/dev/pci/drm/i915
parent683f04ea0ef5443f6494b7613393ad17e18c32ae (diff)
Read the lower 16-bits of the GCFGC "double word". Potentially fixes issues
with some modes on machines with the 915GM chipset. discussed with jsg@
Diffstat (limited to 'sys/dev/pci/drm/i915')
-rw-r--r--sys/dev/pci/drm/i915/intel_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c
index 4cebaae5d16..8797b47d179 100644
--- a/sys/dev/pci/drm/i915/intel_display.c
+++ b/sys/dev/pci/drm/i915/intel_display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_display.c,v 1.52 2015/06/24 17:59:42 kettenis Exp $ */
+/* $OpenBSD: intel_display.c,v 1.53 2015/06/28 15:00:41 kettenis Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
*
@@ -3981,7 +3981,7 @@ static int i915gm_get_display_clock_speed(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
u16 gcfgc = 0;
- gcfgc = pci_conf_read(dev_priv->pc, dev_priv->tag, GCFGC) >> 16;
+ gcfgc = pci_conf_read(dev_priv->pc, dev_priv->tag, GCFGC);
if (gcfgc & GC_LOW_FREQUENCY_ENABLE)
return 133000;