diff options
author | Jani Nikula <jani.nikula@intel.com> | 2014-10-27 17:26:46 +0300 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-05 01:21:57 +0300 |
commit | 33d1e7c6f41656b62a0736a9f0eb977f5f1ff88f (patch) | |
tree | 7ea7cb9765e1a7deefacf1ae4188027c9730af76 /drivers/gpu/drm/i915/intel_audio.c | |
parent | f9f682ae3530f9287379dd91d1b7deaef4abf391 (diff) | |
download | linux-33d1e7c6f41656b62a0736a9f0eb977f5f1ff88f.tar.xz |
drm/i915: pass intel_encoder to intel_write_eld
Everything else can be derived from that. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 00e9bfcd1e8d..829afd5305d1 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -313,10 +313,11 @@ static void ironlake_write_eld(struct drm_connector *connector, I915_WRITE(aud_cntrl_st2, tmp); } -void intel_write_eld(struct drm_encoder *encoder, - struct drm_display_mode *mode) +void intel_write_eld(struct intel_encoder *intel_encoder) { - struct drm_crtc *crtc = encoder->crtc; + struct drm_encoder *encoder = &intel_encoder->base; + struct intel_crtc *crtc = to_intel_crtc(encoder->crtc); + struct drm_display_mode *mode = &crtc->config.adjusted_mode; struct drm_connector *connector; struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -334,7 +335,7 @@ void intel_write_eld(struct drm_encoder *encoder, connector->eld[6] = drm_av_sync_delay(connector, mode) / 2; if (dev_priv->display.write_eld) - dev_priv->display.write_eld(connector, crtc, mode); + dev_priv->display.write_eld(connector, encoder->crtc, mode); } /** |