From 5fc1868d8610dadb91c380a88997583d554d97d8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 12 Dec 2022 05:02:16 +0000 Subject: [PATCH] linux (Rockchip): rebase patches for 6.1 updated based on: - drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420 - https://github.com/torvalds/linux/commit/d3d6b1bf85aefe0ebc0624574b3bb62f0693914c --- .../linux/default/linux-1000-drm-rockchip.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch index 5bbdaabb75..2555d9155f 100644 --- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch @@ -2115,6 +2115,11 @@ index a2d101ebf7a7..7f6ffbc3e7b2 100644 @@ -2732,40 +2744,51 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, */ + /* Default 8bit RGB fallback */ +- output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; ++ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_RGB888_1X24)) ++ output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + if (max_bpc >= 16 && info->bpc == 16) { - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444) + if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR444) && @@ -2168,11 +2173,6 @@ index a2d101ebf7a7..7f6ffbc3e7b2 100644 + is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV8_1X24)) output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; - /* Default 8bit RGB fallback */ -- output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; -+ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_RGB888_1X24)) -+ output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; - *num_output_fmts = i; @@ -2946,11 +2969,20 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,