[PATCH 2/4] drm: Keep coordinates in the typical x, y, w, h order instead of x, y, h, w

[ville.syrj...@linux.intel.com]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/drm_atomic_helper.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c 
b/drivers/gpu/drm/drm_atomic_helper.c
index 7857163..d5693b7 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1477,12 +1477,12 @@ retry:
        drm_atomic_set_fb_for_plane(plane_state, fb);
        plane_state->crtc_x = crtc_x;
        plane_state->crtc_y = crtc_y;
-       plane_state->crtc_h = crtc_h;
        plane_state->crtc_w = crtc_w;
+       plane_state->crtc_h = crtc_h;
        plane_state->src_x = src_x;
        plane_state->src_y = src_y;
-       plane_state->src_h = src_h;
        plane_state->src_w = src_w;
+       plane_state->src_h = src_h;

        if (plane == crtc->cursor)
                state->legacy_cursor_update = true;
@@ -1598,12 +1598,12 @@ int __drm_atomic_helper_disable_plane(struct drm_plane 
*plane,
        drm_atomic_set_fb_for_plane(plane_state, NULL);
        plane_state->crtc_x = 0;
        plane_state->crtc_y = 0;
-       plane_state->crtc_h = 0;
        plane_state->crtc_w = 0;
+       plane_state->crtc_h = 0;
        plane_state->src_x = 0;
        plane_state->src_y = 0;
-       plane_state->src_h = 0;
        plane_state->src_w = 0;
+       plane_state->src_h = 0;

        if (plane->crtc && (plane == plane->crtc->cursor))
                plane_state->state->legacy_cursor_update = true;
@@ -1789,16 +1789,16 @@ int __drm_atomic_helper_set_config(struct drm_mode_set 
*set,
        drm_atomic_set_fb_for_plane(primary_state, set->fb);
        primary_state->crtc_x = 0;
        primary_state->crtc_y = 0;
-       primary_state->crtc_h = vdisplay;
        primary_state->crtc_w = hdisplay;
+       primary_state->crtc_h = vdisplay;
        primary_state->src_x = set->x << 16;
        primary_state->src_y = set->y << 16;
        if (primary_state->rotation & (BIT(DRM_ROTATE_90) | 
BIT(DRM_ROTATE_270))) {
-               primary_state->src_h = hdisplay << 16;
                primary_state->src_w = vdisplay << 16;
+               primary_state->src_h = hdisplay << 16;
        } else {
-               primary_state->src_h = vdisplay << 16;
                primary_state->src_w = hdisplay << 16;
+               primary_state->src_h = vdisplay << 16;
        }

 commit:
-- 
2.4.10