drm/i915: Eliminate some encoder->crtc usage from TV code
Extract the current crtc from the crtc state rather than via the legacy encoder->crtc pointer whenever possible. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171031205123.13123-5-ville.syrjala@linux.intel.com Acked-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
This commit is contained in:
Родитель
463320ae53
Коммит
a7f519ba70
|
@ -822,7 +822,7 @@ intel_enable_tv(struct intel_encoder *encoder,
|
||||||
|
|
||||||
/* Prevents vblank waits from timing out in intel_tv_detect_type() */
|
/* Prevents vblank waits from timing out in intel_tv_detect_type() */
|
||||||
intel_wait_for_vblank(dev_priv,
|
intel_wait_for_vblank(dev_priv,
|
||||||
to_intel_crtc(encoder->base.crtc)->pipe);
|
to_intel_crtc(pipe_config->base.crtc)->pipe);
|
||||||
|
|
||||||
I915_WRITE(TV_CTL, I915_READ(TV_CTL) | TV_ENC_ENABLE);
|
I915_WRITE(TV_CTL, I915_READ(TV_CTL) | TV_ENC_ENABLE);
|
||||||
}
|
}
|
||||||
|
@ -982,7 +982,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,
|
||||||
const struct drm_connector_state *conn_state)
|
const struct drm_connector_state *conn_state)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.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_crtc *intel_crtc = to_intel_crtc(pipe_config->base.crtc);
|
||||||
struct intel_tv *intel_tv = enc_to_tv(encoder);
|
struct intel_tv *intel_tv = enc_to_tv(encoder);
|
||||||
const struct tv_mode *tv_mode = intel_tv_mode_find(conn_state);
|
const struct tv_mode *tv_mode = intel_tv_mode_find(conn_state);
|
||||||
u32 tv_ctl;
|
u32 tv_ctl;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче