tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Keep coordinates in the typical x, y, w, h order instead of x, y, h, w

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Ville Syrjälä and committed by
Daniel Vetter 02e6f379 1eb83451

+7 -7
+7 -7
drivers/gpu/drm/drm_atomic_helper.c
··· 1485 1485 drm_atomic_set_fb_for_plane(plane_state, fb); 1486 1486 plane_state->crtc_x = crtc_x; 1487 1487 plane_state->crtc_y = crtc_y; 1488 - plane_state->crtc_h = crtc_h; 1489 1488 plane_state->crtc_w = crtc_w; 1489 + plane_state->crtc_h = crtc_h; 1490 1490 plane_state->src_x = src_x; 1491 1491 plane_state->src_y = src_y; 1492 - plane_state->src_h = src_h; 1493 1492 plane_state->src_w = src_w; 1493 + plane_state->src_h = src_h; 1494 1494 1495 1495 if (plane == crtc->cursor) 1496 1496 state->legacy_cursor_update = true; ··· 1609 1609 drm_atomic_set_fb_for_plane(plane_state, NULL); 1610 1610 plane_state->crtc_x = 0; 1611 1611 plane_state->crtc_y = 0; 1612 - plane_state->crtc_h = 0; 1613 1612 plane_state->crtc_w = 0; 1613 + plane_state->crtc_h = 0; 1614 1614 plane_state->src_x = 0; 1615 1615 plane_state->src_y = 0; 1616 - plane_state->src_h = 0; 1617 1616 plane_state->src_w = 0; 1617 + plane_state->src_h = 0; 1618 1618 1619 1619 return 0; 1620 1620 } ··· 1797 1797 drm_atomic_set_fb_for_plane(primary_state, set->fb); 1798 1798 primary_state->crtc_x = 0; 1799 1799 primary_state->crtc_y = 0; 1800 - primary_state->crtc_h = vdisplay; 1801 1800 primary_state->crtc_w = hdisplay; 1801 + primary_state->crtc_h = vdisplay; 1802 1802 primary_state->src_x = set->x << 16; 1803 1803 primary_state->src_y = set->y << 16; 1804 1804 if (primary_state->rotation & (BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270))) { 1805 - primary_state->src_h = hdisplay << 16; 1806 1805 primary_state->src_w = vdisplay << 16; 1806 + primary_state->src_h = hdisplay << 16; 1807 1807 } else { 1808 - primary_state->src_h = vdisplay << 16; 1809 1808 primary_state->src_w = hdisplay << 16; 1809 + primary_state->src_h = vdisplay << 16; 1810 1810 } 1811 1811 1812 1812 commit: