aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e440f70e477a..4e8b26161a74 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -946,7 +946,6 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
946#define IS_I830(dev) ((dev)->pci_device == 0x3577) 946#define IS_I830(dev) ((dev)->pci_device == 0x3577)
947#define IS_845G(dev) ((dev)->pci_device == 0x2562) 947#define IS_845G(dev) ((dev)->pci_device == 0x2562)
948#define IS_I85X(dev) ((dev)->pci_device == 0x3582) 948#define IS_I85X(dev) ((dev)->pci_device == 0x3582)
949#define IS_I855(dev) ((dev)->pci_device == 0x3582)
950#define IS_I865G(dev) ((dev)->pci_device == 0x2572) 949#define IS_I865G(dev) ((dev)->pci_device == 0x2572)
951 950
952#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a) 951#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8945656dc1dc..0be624a52e50 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4291,7 +4291,7 @@ void intel_init_clock_gating(struct drm_device *dev)
4291 dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING | 4291 dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |
4292 DSTATE_DOT_CLOCK_GATING; 4292 DSTATE_DOT_CLOCK_GATING;
4293 I915_WRITE(D_STATE, dstate); 4293 I915_WRITE(D_STATE, dstate);
4294 } else if (IS_I855(dev) || IS_I865G(dev)) { 4294 } else if (IS_I85X(dev) || IS_I865G(dev)) {
4295 I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE); 4295 I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
4296 } else if (IS_I830(dev)) { 4296 } else if (IS_I830(dev)) {
4297 I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE); 4297 I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
@@ -4375,7 +4375,7 @@ static void intel_init_display(struct drm_device *dev)
4375 else if (IS_I865G(dev)) 4375 else if (IS_I865G(dev))
4376 dev_priv->display.get_display_clock_speed = 4376 dev_priv->display.get_display_clock_speed =
4377 i865_get_display_clock_speed; 4377 i865_get_display_clock_speed;
4378 else if (IS_I855(dev)) 4378 else if (IS_I85X(dev))
4379 dev_priv->display.get_display_clock_speed = 4379 dev_priv->display.get_display_clock_speed =
4380 i855_get_display_clock_speed; 4380 i855_get_display_clock_speed;
4381 else /* 852, 830 */ 4381 else /* 852, 830 */