drm/i915: Rename intel_context[engine].ringbuf

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_atomic.c

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 50ff90aea72187cd9da6fb5437a6af08b11f63d6..c5a166752edaeed6f7d619bf23d2958894019d83 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -191,7 +191,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
 
                        /* plane scaler case: assign as a plane scaler */
                        /* find the plane that set the bit as scaler_user */
-                       plane = drm_state->planes[i];
+                       plane = drm_state->planes[i].ptr;
 
                        /*
                         * to enable/disable hq mode, add planes that are using scaler
@@ -223,7 +223,8 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
                                continue;
                        }
 
-                       plane_state = to_intel_plane_state(drm_state->plane_states[i]);
+                       plane_state = intel_atomic_get_existing_plane_state(drm_state,
+                                                                           intel_plane);
                        scaler_id = &plane_state->scaler_id;
                }