Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41121248 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Swap w/h when converting the mode to src coordidates for a rotated primary plane 



When converting the mode hdisplay/vdisplay to primary plane src
coordinates we need to take into account the current plane
rotation.

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1444930802-8515-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c390eed0

drivers/gpu/drm/drm_atomic_helper.c

+7 −2
Original line number Diff line number Diff line
@@ -1790,8 +1790,13 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set, 
	primary_state->crtc_w = set->mode->hdisplay;

	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 = set->mode->hdisplay << 16;

		primary_state->src_w = set->mode->vdisplay << 16;

	} else {

		primary_state->src_h = set->mode->vdisplay << 16;

		primary_state->src_w = set->mode->hdisplay << 16;

	}



commit:

	ret = update_output_state(state, set);