| From a4769905f0ae32cae4f096f646ab03b8b4794c74 Mon Sep 17 00:00:00 2001 |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| Date: Mon, 24 Feb 2020 18:38:55 +0100 |
| Subject: drm/sun4i: de2/de3: Remove unsupported VI layer formats |
| |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| |
| commit a4769905f0ae32cae4f096f646ab03b8b4794c74 upstream. |
| |
| YUV444 and YVU444 are planar formats, but HW format RGB888 is packed. |
| This means that those two mappings were never correct. Remove them. |
| |
| Fixes: 60a3dcf96aa8 ("drm/sun4i: Add DE2 definitions for YUV formats") |
| Acked-by: Maxime Ripard <mripard@kernel.org> |
| Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200224173901.174016-2-jernej.skrabec@siol.net |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ------------ |
| drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 -- |
| 2 files changed, 14 deletions(-) |
| |
| --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c |
| +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c |
| @@ -277,12 +277,6 @@ static const struct de2_fmt_info de2_for |
| .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, |
| .rgb = false, |
| @@ -301,12 +295,6 @@ static const struct de2_fmt_info de2_for |
| .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, |
| .rgb = false, |
| --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c |
| +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c |
| @@ -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, |
| }; |
| |
| static const u32 sun8i_vi_layer_de3_formats[] = { |
