drm: Rename plane atomic_check state names

[sfrench/cifs-2.6.git] / drivers / gpu / drm / sti / sti_cursor.c

diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index 7476301d7142a4f6abda782615bd98a62ece085c..c04c868e337f9a218ce8cccb7162ab30cf2ede3c 100644 (file)
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -181,12 +181,12 @@ static void sti_cursor_init(struct sti_cursor *cursor)
 }
 
 static int sti_cursor_atomic_check(struct drm_plane *drm_plane,
-                                  struct drm_plane_state *state)
+                                  struct drm_plane_state *new_plane_state)
 {
        struct sti_plane *plane = to_sti_plane(drm_plane);
        struct sti_cursor *cursor = to_sti_cursor(plane);
-       struct drm_crtc *crtc = state->crtc;
-       struct drm_framebuffer *fb = state->fb;
+       struct drm_crtc *crtc = new_plane_state->crtc;
+       struct drm_framebuffer *fb = new_plane_state->fb;
        struct drm_crtc_state *crtc_state;
        struct drm_display_mode *mode;
        int dst_x, dst_y, dst_w, dst_h;
@@ -196,15 +196,17 @@ static int sti_cursor_atomic_check(struct drm_plane *drm_plane,
        if (!crtc || !fb)
                return 0;
 
-       crtc_state = drm_atomic_get_crtc_state(state->state, crtc);
+       crtc_state = drm_atomic_get_crtc_state(new_plane_state->state, crtc);
        mode = &crtc_state->mode;
-       dst_x = state->crtc_x;
-       dst_y = state->crtc_y;
-       dst_w = clamp_val(state->crtc_w, 0, mode->crtc_hdisplay - dst_x);
-       dst_h = clamp_val(state->crtc_h, 0, mode->crtc_vdisplay - dst_y);
+       dst_x = new_plane_state->crtc_x;
+       dst_y = new_plane_state->crtc_y;
+       dst_w = clamp_val(new_plane_state->crtc_w, 0,
+                         mode->crtc_hdisplay - dst_x);
+       dst_h = clamp_val(new_plane_state->crtc_h, 0,
+                         mode->crtc_vdisplay - dst_y);
        /* src_x are in 16.16 format */
-       src_w = state->src_w >> 16;
-       src_h = state->src_h >> 16;
+       src_w = new_plane_state->src_w >> 16;
+       src_h = new_plane_state->src_h >> 16;
 
        if (src_w < STI_CURS_MIN_SIZE ||
            src_h < STI_CURS_MIN_SIZE ||