Commit d16a11a0 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Inki Dae

drm/exynos: fix clipping when scaling is enabled

This patch fixes calculation of src x/y offset for negative crtc x/y
values when scaling is enabled. This fixes possible IOMMU fault when
scaling is enabled.
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent e463b069
...@@ -85,25 +85,26 @@ static void exynos_plane_mode_set(struct exynos_drm_plane_state *exynos_state) ...@@ -85,25 +85,26 @@ static void exynos_plane_mode_set(struct exynos_drm_plane_state *exynos_state)
src_w = state->src_w >> 16; src_w = state->src_w >> 16;
src_h = state->src_h >> 16; src_h = state->src_h >> 16;
/* set ratio */
exynos_state->h_ratio = (src_w << 16) / crtc_w;
exynos_state->v_ratio = (src_h << 16) / crtc_h;
/* clip to visible area */
actual_w = exynos_plane_get_size(crtc_x, crtc_w, mode->hdisplay); actual_w = exynos_plane_get_size(crtc_x, crtc_w, mode->hdisplay);
actual_h = exynos_plane_get_size(crtc_y, crtc_h, mode->vdisplay); actual_h = exynos_plane_get_size(crtc_y, crtc_h, mode->vdisplay);
if (crtc_x < 0) { if (crtc_x < 0) {
if (actual_w) if (actual_w)
src_x -= crtc_x; src_x += ((-crtc_x) * exynos_state->h_ratio) >> 16;
crtc_x = 0; crtc_x = 0;
} }
if (crtc_y < 0) { if (crtc_y < 0) {
if (actual_h) if (actual_h)
src_y -= crtc_y; src_y += ((-crtc_y) * exynos_state->v_ratio) >> 16;
crtc_y = 0; crtc_y = 0;
} }
/* set ratio */
exynos_state->h_ratio = (src_w << 16) / crtc_w;
exynos_state->v_ratio = (src_h << 16) / crtc_h;
/* set drm framebuffer data. */ /* set drm framebuffer data. */
exynos_state->src.x = src_x; exynos_state->src.x = src_x;
exynos_state->src.y = src_y; exynos_state->src.y = src_y;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment