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@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 v3 2/4] drm: bridge: dw_hdmi: Enable GCP only for Deep Color
Date:   Fri, 15 Apr 2022 10:42:48 +0800
Message-Id: <78fa41e4fb3d3d53354034bc221fcf870dbac617.1649989179.git.Sandor.yu@nxp.com>
In-Reply-To: <cover.1649989179.git.Sandor.yu@nxp.com>
References: <cover.1649989179.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?5Fcy9m8uAD+9Z4nwifG0KUfPYDis8OCB5iNoGjZwuX401ttiP6anwBXEqTLd?=
 =?us-ascii?Q?GZKHi4op8uh4xxqElVFgE1gB0Jej6Xh94eyqAX7+p8z2dHta36lo+n/gl3sO?=
 =?us-ascii?Q?6M/Hy+1x0AayP8lFLRjfg7jxqCm8pglpQwixpUDcuqcIVGWKZTASxaTydnHq?=
 =?us-ascii?Q?2S/ykaxqbsoVZXJmCvVNgS1aiLHx8w6Dqxw0Yp0bGRM1odqXmFS3W7LQk05i?=
 =?us-ascii?Q?yh4WuSdWG1ApfObDw6eZSpf8i0sKuRkcIoNfUuDbIyq1McDISLUooRW/s7z1?=
 =?us-ascii?Q?SA6yoXiTq9nA/zskC2+dWIPXbd4yTzcCMQBGmGiPRDzFOd+W2Tkkv0g6dQGz?=
 =?us-ascii?Q?qJRhQWAr469Ta51YnQdNFkjv2/twdA7z0jx+b+7WmnhER99HNE6TF3Wm02Hc?=
 =?us-ascii?Q?cVDpZ5Uf6d54jpPiRUMYUQLxqHmdqiogN5nhNc0112FGgbf4stVfOGCX3yjj?=
 =?us-ascii?Q?/wjiWxAmvgycLA1ft4OLs8v9BhzFKh35NrYJbwUNID43Ku+d/hr2Sn2eLZXz?=
 =?us-ascii?Q?egTMZY9tYvb4tNKd8qze+WLm8sGbLuM5wV3EMy1vdj5RhdapyXj4zagmCGck?=
 =?us-ascii?Q?/L2rsHG4FcTsbq+iN1hWhP3DalcMsjEXt/E5HhO7+4foIW5LIptdlWA39m5f?=
 =?us-ascii?Q?g4YZa9nv3zbUf//6qX9qm+x0cPhdjq+mMMYboYzFPUcypVevzCtRmz+AsuHi?=
 =?us-ascii?Q?qT9WjSYmvXP7/MmXeaC8Z62QxZ5134j93hDjMwQaJ4b8cfyfREGcRALNyE9g?=
 =?us-ascii?Q?c08Ik8KJIl/fnHwkqbe/XdQS0fIzvvLYy7ju0c2DYlcfD/QW+k/rfZW9ZhfU?=
 =?us-ascii?Q?QNej53lL6ewDm5D4b7yG4EHEttoYSDc4Xt9s3b6h2yt5aHe8iG4Sl/6N1MPn?=
 =?us-ascii?Q?buCa7YB80iN2OTb4k5cJWlhDz+62vykqh66pqi7dvATtgNiohEeWF9m/eHMP?=
 =?us-ascii?Q?mnW0MAYJb50sh6nknTHoRdjxDwRKIjGIceGEp9aAlIpXSk6P89gPe3R2AwTW?=
 =?us-ascii?Q?5AuB0ybYPndI1tOzkuX5NyXdLMYUuuIDFNOqB5/1w/d39LaX9yNou2IaU5JH?=
 =?us-ascii?Q?m/BTFuUA5npIuPghB84PFYmuPXxLYBO0W+yoOShFCW1HDFard97KOaRDhDM6?=
 =?us-ascii?Q?eLq2C9dLIAH5lDQP278ncfO8o98PYhaC+W5yWYK2FnDmUXamlBtEXdVo95sc?=
 =?us-ascii?Q?mkEJwkbUJrqEeCICvC+CmSpx+ldRDyOt04cDy9zGIRfPAReSlZHWV2DnJH3v?=
 =?us-ascii?Q?WkhwXkCywUObK9DrpTbNrmP+szLDUxHOg1GJseBRA5ZrZQp9paO/qKnTOzxS?=
 =?us-ascii?Q?oat2aHQ6QW+b0tIUClfIpSnnkFH60fI4aUcWeqTuKlLdp5NQv7w9SNuu5Zi3?=
 =?us-ascii?Q?y1XdQkbUQ3I+AitRNKB5tRPMEOhzoHm3n18KIrk2DJhQo6Gu2yu/1NLFI0La?=
 =?us-ascii?Q?JllumfNGmgfd3Fogao/URsL43F0JWynNV1LZ9D0qt9WgqwHqKENtkLzkUG7K?=
 =?us-ascii?Q?63N+jfBWAb3oUoFIHmhFISG1XkHoOFjxFGl+PTcChoXYsSjLLJ8t3OQXdDe0?=
 =?us-ascii?Q?uHzCvH4IWjEekciMd6t1pg0qqbZV8uAeA50hXv7kZaX57mMpfnyp4ccqV+Xq?=
 =?us-ascii?Q?7I++jklgp8luREDHtxrO7PbyFeYNelZRG5t6cBpQtBzqxT4eEUM9A9lI1qFT?=
 =?us-ascii?Q?BajMNqj5o3/dFXm/nCT80U5dUb3lExR3fCG/+ayQheHOKl5pSbxnVKNO6YJE?=
 =?us-ascii?Q?NRKs/StY0w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9c4b4e44-a86a-4b3f-778b-08da1e89c89d
X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5450.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 02:43:55.2868
 (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: zPtB/DhPrAv6rWi2H53ithVpFwZFgCF9VY+Re808pUxPttLGO58HjRZtD/jnjjLcqtnKMOA303f8EayZGua7xQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9132
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
        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

From: Sandor Yu <Sandor.yu@nxp.com>

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, but only transmit CD
and do not handle AVMUTE, PP norDefault_Phase (yet).
Disable Auto GCP when 24-bit color for sinks that not support Deep Color.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 17 +++++++++++++++++
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.h |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 02d8f7e08814..312500921754 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,19 @@ 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);
 
+	/* HDMI1.4b specification section 6.5.3:
+	 * Source shall only send GCPs with non-zero CD to sinks
+	 * that indicate support for Deep Color.
+	 * GCP only transmit CD and do not handle AVMUTE, PP norDefault_Phase (yet).
+	 * Disable Auto GCP when 24-bit color for sinks that not support Deep Color.
+	 */
+	val = hdmi_readb(hdmi, HDMI_FC_DATAUTO3);
+	if (clear_gcp_auto == 1)
+		val &= ~HDMI_FC_DATAUTO3_GCP_AUTO;
+	else
+		val |= HDMI_FC_DATAUTO3_GCP_AUTO;
+	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);
 
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
index 1999db05bc3b..18df3e119553 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
@@ -850,6 +850,9 @@ enum {
 	HDMI_FC_DATAUTO0_VSD_MASK = 0x08,
 	HDMI_FC_DATAUTO0_VSD_OFFSET = 3,
 
+/* FC_DATAUTO3 field values */
+	HDMI_FC_DATAUTO3_GCP_AUTO = 0x04,
+
 /* PHY_CONF0 field values */
 	HDMI_PHY_CONF0_PDZ_MASK = 0x80,
 	HDMI_PHY_CONF0_PDZ_OFFSET = 7,
-- 
2.25.1