Commit 1b52ad46 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Remove crtc->config dereferences in intel_sanitize_crtc

We know the crtc is idle because we're at the beginning of sanitization,
so just dereference crtc->state instead.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011100457.8776-7-maarten.lankhorst@linux.intel.com
parent f2bdd112
...@@ -15370,7 +15370,8 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, ...@@ -15370,7 +15370,8 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state);
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
/* Clear any frame start delays used for debugging left by the BIOS */ /* Clear any frame start delays used for debugging left by the BIOS */
if (crtc->active && !transcoder_is_dsi(cpu_transcoder)) { if (crtc->active && !transcoder_is_dsi(cpu_transcoder)) {
...@@ -15380,7 +15381,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, ...@@ -15380,7 +15381,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK); I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
} }
if (crtc->active) { if (crtc_state->base.active) {
struct intel_plane *plane; struct intel_plane *plane;
/* Disable everything but the primary plane */ /* Disable everything but the primary plane */
...@@ -15396,10 +15397,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, ...@@ -15396,10 +15397,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
/* Adjust the state of the output pipe according to whether we /* Adjust the state of the output pipe according to whether we
* have active connectors/encoders. */ * have active connectors/encoders. */
if (crtc->active && !intel_crtc_has_encoders(crtc)) if (crtc_state->base.active && !intel_crtc_has_encoders(crtc))
intel_crtc_disable_noatomic(&crtc->base, ctx); intel_crtc_disable_noatomic(&crtc->base, ctx);
if (crtc->active || HAS_GMCH_DISPLAY(dev_priv)) { if (crtc_state->base.active || HAS_GMCH_DISPLAY(dev_priv)) {
/* /*
* We start out with underrun reporting disabled to avoid races. * We start out with underrun reporting disabled to avoid races.
* For correct bookkeeping mark this on active crtcs. * For correct bookkeeping mark this on active crtcs.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment