Commit 090cb0c6 authored by Dave Stevenson's avatar Dave Stevenson Committed by Eric Anholt
Browse files

drm/vc4: Use .pixel_order instead of custom .flip_cbcr 



The hardware has enums for altering the Cr and Cb order,
so use this instead of having a flag which swaps the
order the pointers are presented to the hardware
(that only worked for 3 plane formats anyway).

Explicitly sets .pixel_order in each case, rather than
relying on then default XYCBCR order being a value 0.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/563872b69c1e5df142cb15ebfca7f20056b8a64c.1510841336.git.dave.stevenson@raspberrypi.org
parent 88f8156f

drivers/gpu/drm/vc4/vc4_plane.c

+8 −12
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static const struct hvs_format { 
	u32 hvs; /* HVS_FORMAT_* */

	u32 pixel_order;

	bool has_alpha;

	bool flip_cbcr;

} hvs_formats[] = {

	{

		.drm = DRM_FORMAT_XRGB8888, .hvs = HVS_PIXEL_FORMAT_RGBA8888,
@@ -131,28 +130,32 @@ static const struct hvs_format { 
	{

		.drm = DRM_FORMAT_YUV422,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,

		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,

	},

	{

		.drm = DRM_FORMAT_YVU422,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,

		.flip_cbcr = true,

		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,

	},

	{

		.drm = DRM_FORMAT_YUV420,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,

		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,

	},

	{

		.drm = DRM_FORMAT_YVU420,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,

		.flip_cbcr = true,

		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,

	},

	{

		.drm = DRM_FORMAT_NV12,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE,

		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,

	},

	{

		.drm = DRM_FORMAT_NV16,

		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE,

		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,

	},

};
@@ -625,15 +628,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, 
	 * The pointers may be any byte address.

	 */

	vc4_state->ptr0_offset = vc4_state->dlist_count;

	if (!format->flip_cbcr) {

	for (i = 0; i < num_planes; i++)

		vc4_dlist_write(vc4_state, vc4_state->offsets[i]);

	} else {

		WARN_ON_ONCE(num_planes != 3);

		vc4_dlist_write(vc4_state, vc4_state->offsets[0]);

		vc4_dlist_write(vc4_state, vc4_state->offsets[2]);

		vc4_dlist_write(vc4_state, vc4_state->offsets[1]);

	}



	/* Pointer Context Word 0/1/2: Written by the HVS */

	for (i = 0; i < num_planes; i++)

CRA Git | Maintained and supported by SUSTech CRA and CCSE