Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sandor Yu <Sandor.yu@nxp.com>
To:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        andrzej.hajda@intel.com, narmstrong@baylibre.com,
        robert.foss@linaro.org, Laurent.pinchart@ideasonboard.com,
        jonas@kwiboo.se, jernej.skrabec@gmail.com, hverkuil-cisco@xs4all.nl
Cc:     Sandor.yu@nxp.com, shengjiu.wang@nxp.com, cai.huoqing@linux.dev,
        maxime@cerno.tech, harry.wentland@amd.com
Subject: [PATCH v2 3/5] drm: bridge: dw_hdmi: Enable GCP only for Deep Color
Date:   Fri,  8 Apr 2022 18:32:26 +0800
Message-Id: <a0f9def7e7438592f78ef0a16cd0a560be0e6133.1649412256.git.Sandor.yu@nxp.com>
In-Reply-To: <cover.1649412256.git.Sandor.yu@nxp.com>
References: <cover.1649412256.git.Sandor.yu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ezpyk5Eu2k3iU6sBJSf/pXyKhQQ2QsmeOwKuKFiOYkEhKS/PePhQ/D1iEjBS?=
 =?us-ascii?Q?2ko4R2ZONrDplB4yQXu0y6RTtQHc15KvKLu765LtEmciLvyCZjQOw2QeR+hb?=
 =?us-ascii?Q?G9ZbygHdW4fyl/dHKwkfK15f8TR8ALbzPm31WEK6S5dVD9SxP/7jeFBpI4Fn?=
 =?us-ascii?Q?jcVUCE+YJirKPikd2EpvCLh/uR/3f+vMY+fnG7fizEQGUe1c49wg2VoUW8RH?=
 =?us-ascii?Q?03y03FK5uf8FlJt40nBkzdtAVK8s+mTyu2aGycAex0aXaiwAqQT1B/6bhCpi?=
 =?us-ascii?Q?9IfxYkb62oBlpiHyjEfcNQl8m0MbOoFkINxheN/jRVTLHJipnthXx4ozPzYa?=
 =?us-ascii?Q?xqyKYHO+yXx1gC7VcQ6vp/kwsmzUcRMsuZqSZX88YmyP1Mkuht3CI03A0YDG?=
 =?us-ascii?Q?2L7Cc6Z81FULidgHg2NQmO3+FHOoCH3StwTqq9LZfM1+RApSSKT/xGilMNDc?=
 =?us-ascii?Q?FlZ+kPWQWE+H9RdbOxv/1sXCvhApEHbVfjDv9EtL77RaJNMa03to7IxWQy8q?=
 =?us-ascii?Q?CmD99vZ7sgmHgRFU0xL4BHpo1ekI50RZJAzCFIg2X78ex+EedX8Fehw3P4qp?=
 =?us-ascii?Q?daiDPqk6jnOR648/AVlhGGQiZLEgJ9UloflWvPdZhy3mntY2s8Vh03BBDgf4?=
 =?us-ascii?Q?cj+KTfgpfHSr1qpjKhqBCrVxVmmntBFyXbYUmpx3m7hljf8V4nsgTMpAJVyw?=
 =?us-ascii?Q?On6QxO2knn6moFrBlH+FAh4I7twN7bO8NTSkqJ7Q2/AuozG8ZP2RePJsx5Ot?=
 =?us-ascii?Q?mpcFhZCfIq+j49QW35/tCulVU8+65P9w1fdLfXP7BkOU+JloMS5kMgRCnNSo?=
 =?us-ascii?Q?Z/lLF0d3i+1ep5mFStCBa3G/L0qirzGhXbGkQvo9gCaJaxW7mBNFLrp8b1MW?=
 =?us-ascii?Q?F7afFL7abtJDEhKRABV4zuJQ/z7FlPjF2C3jOeudr7LoaXLyj6H8vzqR7/Jz?=
 =?us-ascii?Q?F4/kpWZvOMTsKWb9NC1KSFSov2yixPg4vn0Pa8Ksh4hZ52eIaRGkfXxoIp3l?=
 =?us-ascii?Q?z0yzPWsCmWRLdOxhLbrGntMoa0NqSBzSD3WlFLktqRZ33PRlI2XuSjEQLz0v?=
 =?us-ascii?Q?QpSSDqw7qobEMq5NN+xrKyVj7f49S5fl2xZFviNepQJbndc3GnFpPazxK1zB?=
 =?us-ascii?Q?qmzv0fDXu/up6cK9WQ9cvYT44830WdiE3GrKEyVtGyHnmpD2+AaZus0nD3PE?=
 =?us-ascii?Q?aonXm2dV96BPwensGcbD1kEWdWXXXssk13qbeOc8ltZLvz6nKVF5wQ6PvVb9?=
 =?us-ascii?Q?ublKLRlgYcv5azLdDPW5cAvDfJR/3NBIJmkIeSHqlejKAdeHAiGCvK52frGR?=
 =?us-ascii?Q?fvWbKZM4WqbmZ/K8ZOvOuumBC3F8ty3BOy71+DHTlUV1dphKKa5srljMPpvN?=
 =?us-ascii?Q?Hle6mBBgVfSex0SUSImpKSCMezIRGIT63NF2SbAvyH7qIiU2Igjk/HUtpak1?=
 =?us-ascii?Q?zMJv9DpQ1ewSTbTeV6rvMjpuivUwNSJ2Of+lHobMyZ3FIXTJu5Bg7AyHfPmu?=
 =?us-ascii?Q?MZhubhlwkiLFovTgsvOOBlMCQ/2jeBCGhhlSryMHS7w0HPFAMFBRb3bLBTI6?=
 =?us-ascii?Q?6p+tq8HX4IZWscgKmuGcIXiPVB09A/k4hBmg7GqplSJhgRlv+S9sr8SgXZcZ?=
 =?us-ascii?Q?zUzLI46M9cffsi8c2CTSNToP0038bSH4ZsvVLODZWyjGXy0+v/h3C08JWQxH?=
 =?us-ascii?Q?vxcucxf9VcSGJHIuzx3TrOzHqd/EpG4nJCYzP/2a13G7F3mle8Ha8b/fcv3Q?=
 =?us-ascii?Q?exoMvXhjZw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ebeea71f-0afe-4f5b-92c4-08da194b2fe3
X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5450.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 10:33:14.4906
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zdjA4GR6/jD/CBe90U5YdbnM1jjA8Z0FNlo8yMdsW2E+coCWwHZP4QSwioHCmjNJHNW5qT1RlmQCdGeTkAUcOg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3405
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

HDMI1.4b specification section 6.5.3:
Source shall only send GCPs with non-zero CD to sinks
that indicate support for Deep Color.

DW HDMI GCP default enabled, clear gpc_auto bit for 24-bit color depth.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 02d8f7e08814..5a7ec066e37a 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1108,6 +1108,8 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi)
 	unsigned int output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_PP;
 	struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data;
 	u8 val, vp_conf;
+	u8 clear_gcp_auto = 0;
+
 
 	if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) ||
 	    hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format) ||
@@ -1117,6 +1119,7 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi)
 		case 8:
 			color_depth = 4;
 			output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS;
+			clear_gcp_auto = 1;
 			break;
 		case 10:
 			color_depth = 5;
@@ -1136,6 +1139,7 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi)
 		case 0:
 		case 8:
 			remap_size = HDMI_VP_REMAP_YCC422_16bit;
+			clear_gcp_auto = 1;
 			break;
 		case 10:
 			remap_size = HDMI_VP_REMAP_YCC422_20bit;
@@ -1160,6 +1164,14 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi)
 		HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK);
 	hdmi_writeb(hdmi, val, HDMI_VP_PR_CD);
 
+	val = hdmi_readb(hdmi, HDMI_FC_DATAUTO3);
+	if (clear_gcp_auto == 1)
+		/* disable Auto GCP when 24-bit color */
+		val &= ~0x4;
+	else
+		val |= 0x4;
+	hdmi_writeb(hdmi, val, HDMI_FC_DATAUTO3);
+
 	hdmi_modb(hdmi, HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE,
 		  HDMI_VP_STUFF_PR_STUFFING_MASK, HDMI_VP_STUFF);
 
-- 
2.25.1