[PATCH 4/8] drm/i915: Use intel_atomic_get_new_crtc_state in intel_fbc.c

Maarten Lankhorst
2017-07-20T13:15:26Z

The previous commit added intel_atomic_get_new_crtc_state,
convert intel_fbc.c to the new helper.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_fbc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 860b8c26d29b..81d156f04db9 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -1046,7 +1046,7 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,

/* Does this atomic commit involve the CRTC currently tied to FBC? */
if (fbc->crtc &&
- !drm_atomic_get_existing_crtc_state(state, &fbc->crtc->base))
+ !intel_atomic_get_new_crtc_state(state, fbc->crtc))
goto out;

if (!intel_fbc_can_enable(dev_priv))
@@ -1071,8 +1071,7 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,
if (fbc_on_plane_a_only(dev_priv) && crtc->plane != PLANE_A)
continue;

- intel_crtc_state = to_intel_crtc_state(
- drm_atomic_get_existing_crtc_state(state, &crtc->base));
+ intel_crtc_state = intel_atomic_get_new_crtc_state(state, crtc);

intel_crtc_state->enable_fbc = true;
crtc_chosen = true;