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

Commit 36377357 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv 



Commit 05dd0f53 ("OMAPDSS: DISPC: Update
Accumulator configuration for chroma plane") adds
dispc_ovl_set_accu_uv() function that sets the accu, but the function
only handles YUV and NV12 modes, and BUGs otherwise.

The patch also adds a call to the function, but unfortunately the place
of call was such that the mode could be other than YUV or NV12, thus
crashing the driver.

This patchs moves the call to a slightly later spot, at which point only
YUV and NV12 modes are handled.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Chandrabhanu Mahapatra <cmahapatra@ti.com>
parent 3568f2a4

drivers/video/omap2/dss/dispc.c

+4 −3
Original line number Diff line number Diff line
@@ -1304,9 +1304,6 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, 
	int scale_x = out_width != orig_width;

	int scale_y = out_height != orig_height;



	dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width,

			out_height, ilace, color_mode, rotation);



	if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE))

		return;

	if ((color_mode != OMAP_DSS_COLOR_YUV2 &&
@@ -1316,6 +1313,10 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, 
		REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8);

		return;

	}



	dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width,

			out_height, ilace, color_mode, rotation);



	switch (color_mode) {

	case OMAP_DSS_COLOR_NV12:

		/* UV is subsampled by 2 vertically*/