drm: Rename plane atomic_check state names

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

diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
index 2f4a34f14d33e27be4b82f8befa09d3fa070875a..4fe91ab4f1910d2dda02b34c46c815213ae8f692 100644 (file)
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -615,12 +615,12 @@ static int sti_gdp_get_dst(struct device *dev, int dst, int src)
 }
 
 static int sti_gdp_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_gdp *gdp = to_sti_gdp(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 sti_mixer *mixer;
        struct drm_display_mode *mode;
@@ -633,17 +633,19 @@ static int sti_gdp_atomic_check(struct drm_plane *drm_plane,
                return 0;
 
        mixer = to_sti_mixer(crtc);
-       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->hdisplay - dst_x);
-       dst_h = clamp_val(state->crtc_h, 0, mode->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->hdisplay - dst_x);
+       dst_h = clamp_val(new_plane_state->crtc_h, 0, mode->vdisplay - dst_y);
        /* src_x are in 16.16 format */
-       src_x = state->src_x >> 16;
-       src_y = state->src_y >> 16;
-       src_w = clamp_val(state->src_w >> 16, 0, GAM_GDP_SIZE_MAX_WIDTH);
-       src_h = clamp_val(state->src_h >> 16, 0, GAM_GDP_SIZE_MAX_HEIGHT);
+       src_x = new_plane_state->src_x >> 16;
+       src_y = new_plane_state->src_y >> 16;
+       src_w = clamp_val(new_plane_state->src_w >> 16, 0,
+                         GAM_GDP_SIZE_MAX_WIDTH);
+       src_h = clamp_val(new_plane_state->src_h >> 16, 0,
+                         GAM_GDP_SIZE_MAX_HEIGHT);
 
        format = sti_gdp_fourcc2format(fb->format->format);
        if (format == -1) {