diff options
| author | Ville Syrjälä <[email protected]> | 2017-08-23 18:22:26 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2017-09-01 16:52:22 +0300 |
| commit | 2179481363bd82bc51f3f6f3b5fff9f78614887f (patch) | |
| tree | 4e8dc88078103e2645cdf8302018f5f00361b980 | |
| parent | 1a15b77bd14073883a18ee1ac94bd58c3a151546 (diff) | |
drm/i915: Eliminate crtc->state usage from intel_atomic_commit_tail and .crtc_update()
We already have the correct new crtc state so just use that instead of
crtc->state.
Reviewed-by: Maarten Lankhorst <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8e1eb0904ade..216cd9e0e08f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12281,7 +12281,7 @@ static void skl_update_crtcs(struct drm_atomic_state *state, unsigned int cmask = drm_crtc_mask(crtc); intel_crtc = to_intel_crtc(crtc); - cstate = to_intel_crtc_state(crtc->state); + cstate = to_intel_crtc_state(new_crtc_state); pipe = intel_crtc->pipe; if (updated & cmask || !cstate->base.active) @@ -12410,7 +12410,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) intel_check_cpu_fifo_underruns(dev_priv); intel_check_pch_fifo_underruns(dev_priv); - if (!crtc->state->active) { + if (!new_crtc_state->active) { /* * Make sure we don't call initial_watermarks * for ILK-style watermark updates. @@ -12419,7 +12419,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) */ if (INTEL_GEN(dev_priv) >= 9) dev_priv->display.initial_watermarks(intel_state, - to_intel_crtc_state(crtc->state)); + to_intel_crtc_state(new_crtc_state)); } } } |