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

Commit f56aad3a authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Inki Dae
Browse files

drm/exynos: fix x, y coordinates for right bottom pixel 



The x, y coordinates of right bottom pixel cannot be negative numbers.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 60a705a9

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+11 −7
Original line number Diff line number Diff line
@@ -471,6 +471,8 @@ static void fimd_win_commit(struct device *dev, int zpos) 
	struct fimd_win_data *win_data;

	int win = zpos;

	unsigned long val, alpha, size;

	unsigned int last_x;

	unsigned int last_y;



	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -524,16 +526,18 @@ static void fimd_win_commit(struct device *dev, int zpos) 
		VIDOSDxA_TOPLEFT_Y(win_data->offset_y);

	writel(val, ctx->regs + VIDOSD_A(win));



	val = VIDOSDxB_BOTRIGHT_X(win_data->offset_x +

					win_data->ovl_width - 1) |

		VIDOSDxB_BOTRIGHT_Y(win_data->offset_y +

					win_data->ovl_height - 1);

	last_x = win_data->offset_x + win_data->ovl_width;

	if (last_x)

		last_x--;

	last_y = win_data->offset_y + win_data->ovl_height;

	if (last_y)

		last_y--;



	val = VIDOSDxB_BOTRIGHT_X(last_x) | VIDOSDxB_BOTRIGHT_Y(last_y);

	writel(val, ctx->regs + VIDOSD_B(win));



	DRM_DEBUG_KMS("osd pos: tx = %d, ty = %d, bx = %d, by = %d\n",

			win_data->offset_x, win_data->offset_y,

			win_data->offset_x + win_data->ovl_width - 1,

			win_data->offset_y + win_data->ovl_height - 1);

			win_data->offset_x, win_data->offset_y, last_x, last_y);



	/* hardware window 0 doesn't support alpha channel. */

	if (win != 0) {