Commit 06841148 authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/imx: ipuv3-plane: do not advertise YUV formats on planes without CSC 



Only planes that are displayed via the Display Processor (DP) path
support color space conversion. Limit formats on planes that are
shown via the direct Display Controller (DC) path to RGB.

Reported-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 6efb943b

drivers/gpu/drm/imx/ipuv3-plane.c

+37 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline struct ipu_plane *to_ipu_plane(struct drm_plane *p) 
	return container_of(p, struct ipu_plane, base);

}



static const uint32_t ipu_plane_formats[] = {

static const uint32_t ipu_plane_all_formats[] = {

	DRM_FORMAT_ARGB1555,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_ABGR1555,
@@ -72,6 +72,31 @@ static const uint32_t ipu_plane_formats[] = { 
	DRM_FORMAT_BGRX8888_A8,

};



static const uint32_t ipu_plane_rgb_formats[] = {

	DRM_FORMAT_ARGB1555,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_ABGR1555,

	DRM_FORMAT_XBGR1555,

	DRM_FORMAT_RGBA5551,

	DRM_FORMAT_BGRA5551,

	DRM_FORMAT_ARGB4444,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_RGBA8888,

	DRM_FORMAT_RGBX8888,

	DRM_FORMAT_BGRA8888,

	DRM_FORMAT_BGRX8888,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_RGB565_A8,

	DRM_FORMAT_BGR565_A8,

	DRM_FORMAT_RGB888_A8,

	DRM_FORMAT_BGR888_A8,

	DRM_FORMAT_RGBX8888_A8,

	DRM_FORMAT_BGRX8888_A8,

};



static const uint64_t ipu_format_modifiers[] = {

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID
@@ -830,16 +855,24 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu, 
	struct ipu_plane *ipu_plane;

	const uint64_t *modifiers = ipu_format_modifiers;

	unsigned int zpos = (type == DRM_PLANE_TYPE_PRIMARY) ? 0 : 1;

	unsigned int format_count;

	const uint32_t *formats;

	int ret;



	DRM_DEBUG_KMS("channel %d, dp flow %d, possible_crtcs=0x%x\n",

		      dma, dp, possible_crtcs);



	if (dp == IPU_DP_FLOW_SYNC_BG || dp == IPU_DP_FLOW_SYNC_FG) {

		formats = ipu_plane_all_formats;

		format_count = ARRAY_SIZE(ipu_plane_all_formats);

	} else {

		formats = ipu_plane_rgb_formats;

		format_count = ARRAY_SIZE(ipu_plane_rgb_formats);

	}

	ipu_plane = drmm_universal_plane_alloc(dev, struct ipu_plane, base,

					       possible_crtcs, &ipu_plane_funcs,

					       ipu_plane_formats,

					       ARRAY_SIZE(ipu_plane_formats),

					       modifiers, type, NULL);

					       formats, format_count, modifiers,

					       type, NULL);

	if (IS_ERR(ipu_plane)) {

		DRM_ERROR("failed to allocate and initialize %s plane\n",

			  zpos ? "overlay" : "primary");