diff options
| author | Tvrtko Ursulin | 2016-11-07 10:29:20 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-11-11 15:58:26 +0100 |
| commit | 56b857a5e3c6a1f0f082938ee9be460366b6fa38 (patch) | |
| tree | 19e94d9882ae24ede36e9ac07521018e15cbfa89 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Assorted dev_priv cleanups (diff) | |
| download | kernel-qcow2-linux-56b857a5e3c6a1f0f082938ee9be460366b6fa38.tar.gz kernel-qcow2-linux-56b857a5e3c6a1f0f082938ee9be460366b6fa38.tar.xz kernel-qcow2-linux-56b857a5e3c6a1f0f082938ee9be460366b6fa38.zip | |
drm/i915: More assorted dev_priv cleanups
A small selection of macros which can only accept dev_priv from
now on and a resulting trickle of fixups.
v2: Keep original order. (Ville Syrjala)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 15473497e891..0f09b68fd555 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8440,7 +8440,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) } } - if (HAS_PIPE_CXSR(dev)) { + if (HAS_PIPE_CXSR(dev_priv)) { if (intel_crtc->lowfreq_avail) { DRM_DEBUG_KMS("enabling CxSR downclocking\n"); pipeconf |= PIPECONF_CXSR_DOWNCLOCK; @@ -15652,7 +15652,7 @@ static void intel_setup_outputs(struct drm_device *dev) } else if (IS_GEN2(dev_priv)) intel_dvo_init(dev); - if (SUPPORTS_TV(dev)) + if (SUPPORTS_TV(dev_priv)) intel_tv_init(dev); intel_psr_init(dev); |