diff options
| author | Tvrtko Ursulin | 2016-11-16 09:55:40 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-11-17 14:56:35 +0100 |
| commit | 66478475b57ed2c652b2fdd3e1052830f569bbd2 (patch) | |
| tree | a532813cc094fdc53456f683d5054868db854322 /drivers/gpu/drm/i915/intel_tv.c | |
| parent | drm/i915: dev_priv cleanup in i915_suspend.c (diff) | |
| download | kernel-qcow2-linux-66478475b57ed2c652b2fdd3e1052830f569bbd2.tar.gz kernel-qcow2-linux-66478475b57ed2c652b2fdd3e1052830f569bbd2.tar.xz kernel-qcow2-linux-66478475b57ed2c652b2fdd3e1052830f569bbd2.zip | |
drm/i915: Assorted INTEL_INFO(dev) cleanups
A bunch of source files with just a few instances of the
incorrect INTEL_INFO use.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_tv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 9212f00d5752..78cdfc6833d6 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1029,8 +1029,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_device *dev = encoder->base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); struct intel_tv *intel_tv = enc_to_tv(encoder); const struct tv_mode *tv_mode = intel_tv_mode_find(intel_tv); @@ -1116,7 +1115,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, set_color_conversion(dev_priv, color_conversion); - if (INTEL_INFO(dev)->gen >= 4) + if (INTEL_GEN(dev_priv) >= 4) I915_WRITE(TV_CLR_KNOBS, 0x00404000); else I915_WRITE(TV_CLR_KNOBS, 0x00606000); |