Commit a4769905 authored by Jernej Skrabec's avatar Jernej Skrabec
Browse files

drm/sun4i: de2/de3: Remove unsupported VI layer formats 



YUV444 and YVU444 are planar formats, but HW format RGB888 is packed.
This means that those two mappings were never correct. Remove them.

Fixes: 60a3dcf9 ("drm/sun4i: Add DE2 definitions for YUV formats")
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20200224173901.174016-2-jernej.skrabec@siol.net
parent 852d7655

drivers/gpu/drm/sun4i/sun8i_mixer.c

+0 −12
Original line number Diff line number Diff line
@@ -196,12 +196,6 @@ static const struct de2_fmt_info de2_formats[] = { 
		.rgb = false,

		.csc = SUN8I_CSC_MODE_YUV2RGB,

	},

	{

		.drm_fmt = DRM_FORMAT_YUV444,

		.de2_fmt = SUN8I_MIXER_FBFMT_RGB888,

		.rgb = true,

		.csc = SUN8I_CSC_MODE_YUV2RGB,

	},

	{

		.drm_fmt = DRM_FORMAT_YUV422,

		.de2_fmt = SUN8I_MIXER_FBFMT_YUV422,
@@ -220,12 +214,6 @@ static const struct de2_fmt_info de2_formats[] = { 
		.rgb = false,

		.csc = SUN8I_CSC_MODE_YUV2RGB,

	},

	{

		.drm_fmt = DRM_FORMAT_YVU444,

		.de2_fmt = SUN8I_MIXER_FBFMT_RGB888,

		.rgb = true,

		.csc = SUN8I_CSC_MODE_YVU2RGB,

	},

	{

		.drm_fmt = DRM_FORMAT_YVU422,

		.de2_fmt = SUN8I_MIXER_FBFMT_YUV422,

drivers/gpu/drm/sun4i/sun8i_vi_layer.c

+0 −2
Original line number Diff line number Diff line
@@ -431,11 +431,9 @@ static const u32 sun8i_vi_layer_formats[] = { 
	DRM_FORMAT_YUV411,

	DRM_FORMAT_YUV420,

	DRM_FORMAT_YUV422,

	DRM_FORMAT_YUV444,

	DRM_FORMAT_YVU411,

	DRM_FORMAT_YVU420,

	DRM_FORMAT_YVU422,

	DRM_FORMAT_YVU444,

};



struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct drm_device *drm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE