From nobody Tue Jun 16 05:01:58 2026 Received: from canpmsgout07.his.huawei.com (canpmsgout07.his.huawei.com [113.46.200.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12DB538BF87 for ; Thu, 16 Apr 2026 09:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.222 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330874; cv=none; b=rgUqgxHjAEl3iHT9DlxyESr14wjyRAeFGvENB+3m7CIv0pfXZ+9QKPfYaAkjxCUJuhcUNKXZ3X2VkgcY4f+qJ4P4uJrVOtPiN5UWaUc1kFu9TjZ+SsWq60dL9Mdg3N2cVxRG16UIx6J2W46b3WoLyAz2KYjFClJg79c4xSmutaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330874; c=relaxed/simple; bh=ERx64GFh5z6I41wuuRFxAnwOKRME70VnwyIw63GFxvY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SixaCJvMf5d16Aohyo0cM3NujXlMYHuzoltX5imbKyoYeJb2yrog+zE7QLAV+dtqxS+s6Dp3Pk1SeJVy8ojK2+XNfclGQURTwNvCEnqC2aPrhj8Kla2PRLnLjBXa/u98yo0CUDF3bEId3mOUO8hp2tFDuLBWbZGQr8k/lh1zpHA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=DAFIRnYr; arc=none smtp.client-ip=113.46.200.222 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="DAFIRnYr" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=HVGuWGkn8qWlrD3mMTeX1j/utDqoTv5W00gDHIxi5jg=; b=DAFIRnYritZCMo9z+NoseYUJKkAKtKYEF5uttm3LD5ccqyNVyZFCrhqmTI/9BvjWsQWwLDbKg dhJeqXlmk9DYDVoncMqD35j9gk1ljsh7GwmzjNl9moY5ISYY09K6juv00Sz5OGAI36868rPCyqR uBoy0v0JJMFvPBb0amB0HZk= Received: from mail.maildlp.com (unknown [172.19.163.127]) by canpmsgout07.his.huawei.com (SkyGuard) with ESMTPS id 4fxBxl0qPpzLlSv; Thu, 16 Apr 2026 17:08:11 +0800 (CST) Received: from dggemv706-chm.china.huawei.com (unknown [10.3.19.33]) by mail.maildlp.com (Postfix) with ESMTPS id 4DFA54058D; Thu, 16 Apr 2026 17:14:29 +0800 (CST) Received: from kwepemq100007.china.huawei.com (7.202.195.175) by dggemv706-chm.china.huawei.com (10.3.19.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:29 +0800 Received: from localhost.huawei.com (10.169.71.169) by kwepemq100007.china.huawei.com (7.202.195.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:28 +0800 From: Yongbang Shi To: , , , , , , , , CC: , , , , , , , , Subject: [PATCH for drm-misc-fixes v3 1/4] drm/hisilicon/hibmc: add updating link cap in DP detect() Date: Thu, 16 Apr 2026 17:05:39 +0800 Message-ID: <20260416090542.1984002-2-shiyongbang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260416090542.1984002-1-shiyongbang@huawei.com> References: <20260416090542.1984002-1-shiyongbang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemq100007.china.huawei.com (7.202.195.175) Content-Type: text/plain; charset="utf-8" From: Lin He In the past, the link cap is updated in link training at encoder enable stage, but the hibmc_dp_mode_valid() is called before it, which will use DP link's rate and lanes. So add the hibmc_dp_update_caps() in hibmc_dp_update_caps() to avoid some potential risks. Fixes: 607805abfb74 ("drm/hisilicon/hibmc: add dp mode valid check") Signed-off-by: Lin He Signed-off-by: Yongbang Shi --- ChangeLog: v1 -> v2: - fix the checkpatch.pl warning "Unknown commit ID 'e6c7c59da494'". - remove tag "Reviewed-by: Tao Tian ", witch will be given in public. - add 'drm-misc-fixes' in subject prefix. --- drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 1 + drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h b/drivers/gpu/drm= /hisilicon/hibmc/dp/dp_comm.h index f9ee7ebfec55..f53dac256ee0 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h @@ -69,5 +69,6 @@ int hibmc_dp_link_training(struct hibmc_dp_dev *dp); int hibmc_dp_serdes_init(struct hibmc_dp_dev *dp); int hibmc_dp_serdes_rate_switch(u8 rate, struct hibmc_dp_dev *dp); int hibmc_dp_serdes_set_tx_cfg(struct hibmc_dp_dev *dp, u8 train_set[HIBMC= _DP_LANE_NUM_MAX]); +void hibmc_dp_update_caps(struct hibmc_dp_dev *dp); =20 #endif diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c b/drivers/gpu/drm= /hisilicon/hibmc/dp/dp_link.c index 0726cb5b736e..8c53f16db516 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c @@ -325,7 +325,7 @@ static int hibmc_dp_link_downgrade_training_eq(struct h= ibmc_dp_dev *dp) return hibmc_dp_link_reduce_rate(dp); } =20 -static void hibmc_dp_update_caps(struct hibmc_dp_dev *dp) +void hibmc_dp_update_caps(struct hibmc_dp_dev *dp) { dp->link.cap.link_rate =3D dp->dpcd[DP_MAX_LINK_RATE]; if (dp->link.cap.link_rate > DP_LINK_BW_8_1 || !dp->link.cap.link_rate) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/d= rm/hisilicon/hibmc/hibmc_drm_dp.c index 616821e3c933..35dff7bfbf76 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c @@ -41,6 +41,8 @@ static bool hibmc_dp_get_dpcd(struct hibmc_dp_dev *dp_dev) if (ret) return false; =20 + hibmc_dp_update_caps(dp_dev); + dp_dev->is_branch =3D drm_dp_is_branch(dp_dev->dpcd); =20 ret =3D drm_dp_read_desc(dp_dev->aux, &dp_dev->desc, dp_dev->is_branch); --=20 2.33.0 From nobody Tue Jun 16 05:01:58 2026 Received: from canpmsgout12.his.huawei.com (canpmsgout12.his.huawei.com [113.46.200.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2D69387599 for ; Thu, 16 Apr 2026 09:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330876; cv=none; b=HfXE4pOFKIb+CubQ0WjYHzC+Qxx5vbgRD5uWVv6MScphEflPpv9CAfR9fmBvdCYdqKZXf6Kei4RA/XGiPCcx24I8T27XjNxz+vTUZpddDUntF2AWk2gNkdcfz0K2hbVy5jFrBdpASp1LdtCR+j5fARsaYOoD+ufJhuw0RJ6rWho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330876; c=relaxed/simple; bh=cekVDkDG+xCgrgNKdqB0UOQZ5ks1Hg8K7rJXlZWo2gk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hyeu7LULqk7G6YZKO4AlLwEgPG74lde99H1naMXdG5qm8POrSs9ZqIM1Jwv44f/cs07P9JKWnJ4SVpsjGDVvID2IOI0IEGc9u1P7ORBZKH+SClZDD/q2688v+Z5dWGwTrIm6G4fqMMfva/ptCRZEI9XxpF7YO52TtZ5yG7g4TRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=Qzrm7kjj; arc=none smtp.client-ip=113.46.200.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="Qzrm7kjj" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=OZTBTKcnwyTAEV4BlINvIip8mO/Xv2gyjCHQ7cOFYbg=; b=Qzrm7kjjloHcVKivEpr51VquIGwJqNi3UzAhA+e0yHdDsWA0TZ9o3it1POY26vdYefJTTPRYQ kjHcr/1niyadgeM8S1MPCicVK0iMnqUE7LrvYWsZP/trFsDwRHTHb24gMlRpIcEgMI8V2f4gfsv 4WTnub/annZXCHn6dUiyw54= Received: from mail.maildlp.com (unknown [172.19.163.214]) by canpmsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4fxBxm0pRFznTX7; Thu, 16 Apr 2026 17:08:12 +0800 (CST) Received: from dggemv706-chm.china.huawei.com (unknown [10.3.19.33]) by mail.maildlp.com (Postfix) with ESMTPS id 81E4A40561; Thu, 16 Apr 2026 17:14:29 +0800 (CST) Received: from kwepemq100007.china.huawei.com (7.202.195.175) by dggemv706-chm.china.huawei.com (10.3.19.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:29 +0800 Received: from localhost.huawei.com (10.169.71.169) by kwepemq100007.china.huawei.com (7.202.195.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:28 +0800 From: Yongbang Shi To: , , , , , , , , CC: , , , , , , , , Subject: [PATCH for drm-misc-fixes v3 2/4] drm/hisilicon/hibmc: fix no showing when no connectors connected Date: Thu, 16 Apr 2026 17:05:40 +0800 Message-ID: <20260416090542.1984002-3-shiyongbang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260416090542.1984002-1-shiyongbang@huawei.com> References: <20260416090542.1984002-1-shiyongbang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemq100007.china.huawei.com (7.202.195.175) Content-Type: text/plain; charset="utf-8" From: Lin He Our chip support KVM over IP feature, so hibmc driver need to support displaying without any connectors plugged in. If no connectors are connected, the vdac connector status should be set to 'connected' to ensure proper KVM display functionality. Additionally, for previous-generation products that may lack hardware link support and thus cannot detect the monitor, the same approach should be applied to ensure VGA display functionality. Add phys_state in the struct of dp and vdac to check all physical outputs. For get_modes: using BMC modes for connector if no display is attached to phys VGA cable, otherwise use EDID modes by drm_connector_helper_get_modes, because KVM doesn't provide EDID reads. Fixes: 4c962bc929f1 ("drm/hisilicon/hibmc: Add vga connector detect functio= ns") Reported-by: Thomas Zimmermann Closes: https://lore.kernel.org/all/0eb5c509-2724-4c57-87ad-74e4270d5a5a@su= se.de/ Signed-off-by: Lin He Signed-off-by: Yongbang Shi --- ChangeLog: v1 -> v2: - fix the checkpatch.pl warning "line length of 83/85 exceeds 80 columns". - remove tag "Reviewed-by: Tao Tian ", witch will be given in public. - add 'drm-misc-fixes' in subject prefix. --- drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 33 +++++++++----- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 45 +++++++++++++------ 4 files changed, 56 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h b/drivers/gpu/drm/h= isilicon/hibmc/dp/dp_hw.h index 31316fe1ea8d..dfaeabd05d46 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h @@ -55,6 +55,7 @@ struct hibmc_dp { struct drm_dp_aux aux; struct hibmc_dp_cbar_cfg cfg; u32 irq_status; + int phys_state; }; =20 int hibmc_dp_hw_init(struct hibmc_dp *dp); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/d= rm/hisilicon/hibmc/hibmc_drm_dp.c index 35dff7bfbf76..8fe2eb51a0b3 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c @@ -61,27 +61,38 @@ static int hibmc_dp_detect(struct drm_connector *connec= tor, { struct hibmc_dp *dp =3D to_hibmc_dp(connector); struct hibmc_dp_dev *dp_dev =3D dp->dp_dev; - int ret; + int ret =3D connector_status_disconnected; =20 if (dp->irq_status) { - if (dp_dev->hpd_status !=3D HIBMC_HPD_IN) - return connector_status_disconnected; + if (dp_dev->hpd_status !=3D HIBMC_HPD_IN) { + ret =3D connector_status_disconnected; + goto exit; + } } =20 - if (!hibmc_dp_get_dpcd(dp_dev)) - return connector_status_disconnected; + if (!hibmc_dp_get_dpcd(dp_dev)) { + ret =3D connector_status_disconnected; + goto exit; + } =20 - if (!dp_dev->is_branch) - return connector_status_connected; + if (!dp_dev->is_branch) { + ret =3D connector_status_connected; + goto exit; + } =20 if (drm_dp_read_sink_count_cap(connector, dp_dev->dpcd, &dp_dev->desc) && dp_dev->downstream_ports[0] & DP_DS_PORT_HPD) { ret =3D drm_dp_read_sink_count(dp_dev->aux); - if (ret > 0) - return connector_status_connected; + if (ret > 0) { + ret =3D connector_status_connected; + goto exit; + } } =20 - return connector_status_disconnected; +exit: + dp->phys_state =3D ret; + + return ret; } =20 static int hibmc_dp_mode_valid(struct drm_connector *connector, @@ -243,5 +254,7 @@ int hibmc_dp_init(struct hibmc_drm_private *priv) =20 connector->polled =3D DRM_CONNECTOR_POLL_HPD; =20 + dp->phys_state =3D connector_status_disconnected; + return 0; } diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/= drm/hisilicon/hibmc/hibmc_drm_drv.h index ca8502e2760c..6abb49b5107b 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -31,6 +31,7 @@ struct hibmc_vdac { struct drm_connector connector; struct i2c_adapter adapter; struct i2c_algo_bit_data bit_data; + int phys_state; }; =20 struct hibmc_drm_private { diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu= /drm/hisilicon/hibmc/hibmc_drm_vdac.c index 841e81f47b68..806d54120d89 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -25,27 +25,20 @@ static int hibmc_connector_get_modes(struct drm_connector *connector) { struct hibmc_vdac *vdac =3D to_hibmc_vdac(connector); - const struct drm_edid *drm_edid; - int count; + int count =3D 0; =20 - drm_edid =3D drm_edid_read_ddc(connector, &vdac->adapter); + if (vdac->phys_state =3D=3D connector_status_connected) + count =3D drm_connector_helper_get_modes(connector); =20 - drm_edid_connector_update(connector, drm_edid); - - if (drm_edid) { - count =3D drm_edid_connector_add_modes(connector); - if (count) - goto out; - } + if (count > 0) + return count; =20 + drm_edid_connector_update(connector, NULL); count =3D drm_add_modes_noedid(connector, connector->dev->mode_config.max_width, connector->dev->mode_config.max_height); drm_set_preferred_mode(connector, 1024, 768); =20 -out: - drm_edid_free(drm_edid); - return count; } =20 @@ -57,10 +50,32 @@ static void hibmc_connector_destroy(struct drm_connecto= r *connector) drm_connector_cleanup(connector); } =20 +static int hibmc_vdac_detect(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force) +{ + struct hibmc_drm_private *priv =3D to_hibmc_drm_private(connector->dev); + struct hibmc_vdac *vdac =3D to_hibmc_vdac(connector); + + vdac->phys_state =3D drm_connector_helper_detect_from_ddc(connector, + ctx, force); + + /* If the DP connectors are disconnected, the hibmc_vdac_detect function + * must return a connected state to ensure KVM display functionality. + * Additionally, for previous-generation products that may lack hardware + * link support and thus cannot detect the monitor, hibmc_vdac_detect + * should also return a connected state. + */ + if (priv->dp.phys_state !=3D connector_status_connected) + return connector_status_connected; + + return vdac->phys_state; +} + static const struct drm_connector_helper_funcs hibmc_connector_helper_funcs =3D { .get_modes =3D hibmc_connector_get_modes, - .detect_ctx =3D drm_connector_helper_detect_from_ddc, + .detect_ctx =3D hibmc_vdac_detect, }; =20 static const struct drm_connector_funcs hibmc_connector_funcs =3D { @@ -130,6 +145,8 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) =20 connector->polled =3D DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DIS= CONNECT; =20 + vdac->phys_state =3D connector_status_connected; + return 0; =20 err: --=20 2.33.0 From nobody Tue Jun 16 05:01:58 2026 Received: from canpmsgout12.his.huawei.com (canpmsgout12.his.huawei.com [113.46.200.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2CEF78F39 for ; Thu, 16 Apr 2026 09:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330874; cv=none; b=sWPME7EwcfcWnC25s3QnN0O6zlkw4IbBpR3VaL0RFzehiWS9c61+9eht1fTmFD6FaHf+76YRM5oLBKas0vRBZzTr8zaonveZhlPZH61zMNyalRcixSfRmb/4hd8Dzbk3WTXE7AIQXPZj/7wbESep9A2864uNFQBGcUB/9SFJh9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330874; c=relaxed/simple; bh=kS+GLoS2WkyI+mwpPppgKRaUwPv9N/VNhfpLDMC4eGA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q2bbyZZ21v7hnI4O1YWi8r0RIP+3N7r6pG8RAqKMKtFUCL+xqw0/dYBWQOakk/dGIa3Vj0GpvMQvR8lqyT3o+uOxSiGEK4WJi7Ojw7qk+HH73IoJGSsxv9yX0kTjVrggmhav/eP8jvy41df29lcUD69XYv+d71wUMV2GofI5SOw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=LOTNfhZM; arc=none smtp.client-ip=113.46.200.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="LOTNfhZM" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=vMW8vxgFzwqasxK5Yc+iahhJv6rwiKjWUvfTv57t/YM=; b=LOTNfhZMNENVczJO7o4xC5zTbVKWB4vEyE7PXJsaMOqjhiWr+7XnDAVwcnulbVoIMI3+SNKdP nWNVdYU5PQVcDaLkr7rSazJ/H2aBOfPTCkjreDJ3rMseUNejXfGIc7bQwnhjRq6TeM72MMMuQpi gT2TUKODk8K0ZLokN2CFUnI= Received: from mail.maildlp.com (unknown [172.19.163.15]) by canpmsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4fxBxm50jxznTX7; Thu, 16 Apr 2026 17:08:12 +0800 (CST) Received: from dggemv712-chm.china.huawei.com (unknown [10.1.198.32]) by mail.maildlp.com (Postfix) with ESMTPS id 1E07940571; Thu, 16 Apr 2026 17:14:30 +0800 (CST) Received: from kwepemq100007.china.huawei.com (7.202.195.175) by dggemv712-chm.china.huawei.com (10.1.198.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:29 +0800 Received: from localhost.huawei.com (10.169.71.169) by kwepemq100007.china.huawei.com (7.202.195.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:29 +0800 From: Yongbang Shi To: , , , , , , , , CC: , , , , , , , , Subject: [PATCH for drm-misc-fixes v3 3/4] drm/hisilicon/hibmc: move display contrl config to hibmc_probe() Date: Thu, 16 Apr 2026 17:05:41 +0800 Message-ID: <20260416090542.1984002-4-shiyongbang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260416090542.1984002-1-shiyongbang@huawei.com> References: <20260416090542.1984002-1-shiyongbang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemq100007.china.huawei.com (7.202.195.175) Content-Type: text/plain; charset="utf-8" From: Lin He If there's no VGA output, this encoder modeset won't be called, which will cause displaying data from GPU being cut off. It's actually a common display config for DP and VGA, so move the vdac encoder modeset to driver load stage. Fixes: 5294967f4ae4 ("drm/hisilicon/hibmc: Add support for VDAC") Signed-off-by: Lin He Signed-off-by: Yongbang Shi --- ChangeLog: v1 -> v2: - remove tag "Reviewed-by: Tao Tian ", witch will be given in public. - add 'drm-misc-fixes' in subject prefix. --- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 14 ++++++++++++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 22 ------------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/= drm/hisilicon/hibmc/hibmc_drm_drv.c index 289304500ab0..c7ce44a5370b 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -214,6 +214,18 @@ void hibmc_set_current_gate(struct hibmc_drm_private *= priv, unsigned int gate) writel(gate, mmio + gate_reg); } =20 +static void hibmc_display_ctrl(struct hibmc_drm_private *priv) +{ + u32 reg; + + reg =3D readl(priv->mmio + HIBMC_DISPLAY_CONTROL_HISILE); + reg |=3D HIBMC_DISPLAY_CONTROL_FPVDDEN(1); + reg |=3D HIBMC_DISPLAY_CONTROL_PANELDATE(1); + reg |=3D HIBMC_DISPLAY_CONTROL_FPEN(1); + reg |=3D HIBMC_DISPLAY_CONTROL_VBIASEN(1); + writel(reg, priv->mmio + HIBMC_DISPLAY_CONTROL_HISILE); +} + static void hibmc_hw_config(struct hibmc_drm_private *priv) { u32 reg; @@ -245,6 +257,8 @@ static void hibmc_hw_config(struct hibmc_drm_private *p= riv) reg |=3D HIBMC_MSCCTL_LOCALMEM_RESET(1); =20 writel(reg, priv->mmio + HIBMC_MISC_CTRL); + + hibmc_display_ctrl(priv); } =20 static int hibmc_hw_map(struct hibmc_drm_private *priv) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu= /drm/hisilicon/hibmc/hibmc_drm_vdac.c index 806d54120d89..f5c7857c6586 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -86,26 +86,6 @@ static const struct drm_connector_funcs hibmc_connector_= funcs =3D { .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -static void hibmc_encoder_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adj_mode) -{ - u32 reg; - struct drm_device *dev =3D encoder->dev; - struct hibmc_drm_private *priv =3D to_hibmc_drm_private(dev); - - reg =3D readl(priv->mmio + HIBMC_DISPLAY_CONTROL_HISILE); - reg |=3D HIBMC_DISPLAY_CONTROL_FPVDDEN(1); - reg |=3D HIBMC_DISPLAY_CONTROL_PANELDATE(1); - reg |=3D HIBMC_DISPLAY_CONTROL_FPEN(1); - reg |=3D HIBMC_DISPLAY_CONTROL_VBIASEN(1); - writel(reg, priv->mmio + HIBMC_DISPLAY_CONTROL_HISILE); -} - -static const struct drm_encoder_helper_funcs hibmc_encoder_helper_funcs = =3D { - .mode_set =3D hibmc_encoder_mode_set, -}; - int hibmc_vdac_init(struct hibmc_drm_private *priv) { struct drm_device *dev =3D &priv->dev; @@ -128,8 +108,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) goto err; } =20 - drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs); - ret =3D drm_connector_init_with_ddc(dev, connector, &hibmc_connector_funcs, DRM_MODE_CONNECTOR_VGA, --=20 2.33.0 From nobody Tue Jun 16 05:01:58 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9255387599 for ; Thu, 16 Apr 2026 09:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330887; cv=none; b=nEm5btWnq8n44eWz9QlF4QfM+JFxCAb31h5VF9bRRFgXmCQ8NThFbQx06WmQHRywHR4ydR0q2pH/q9441AG6tBiAqkKmhy6tPK/c/mxcLapHz3dAGnfp9fax5RHaGsv1hlJLPdC5PAhd9C/sa63w1kKYrAHpFiTLu1M67wQLvrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776330887; c=relaxed/simple; bh=leNi5E0NhPP8+kYQ4FZwa+rLvhF+KlhCugL5AoDDqGk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mdrvVbJrqDnaqqpv0wSDx4M27B5fyKGSzuweH1u7/jD1yad9eIB+Qt+sEMU8/VUxr0Ok6IvWt5NppEu0HlIlEFVKyB+As7yKAi+uEBMc1qzX+rukzHDD7xsFkfSbTYzXMrJfUxCyGQIny7G9O/3aJInLwBTYxUPlee8GlVYyBRY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=T04N4mNe; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=T04N4mNe; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="T04N4mNe"; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="T04N4mNe" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=CyxNms4u51j8X7bRCNIf3jHmlTROkjy+D77Ec+H5b7k=; b=T04N4mNe07y/2L3/tntZIUGv6JGiZEjY3Q6Sn5YH70QigqyX6wTZdBmJqhZShhCWGFVIFUTf8 PMjS3k9FxzKoB799dJ61x7eTVWBxQ1gduzh140CuVsiBbmqcpcLwEx3DI5bmHzwHt4ujh9WR6C9 ItS/9XZ5VmrOxjcxffU3faw= Received: from canpmsgout11.his.huawei.com (unknown [172.19.92.148]) by szxga01-in.huawei.com (SkyGuard) with ESMTPS id 4fxC4M3PlWz1BFxJ for ; Thu, 16 Apr 2026 17:13:55 +0800 (CST) dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=CyxNms4u51j8X7bRCNIf3jHmlTROkjy+D77Ec+H5b7k=; b=T04N4mNe07y/2L3/tntZIUGv6JGiZEjY3Q6Sn5YH70QigqyX6wTZdBmJqhZShhCWGFVIFUTf8 PMjS3k9FxzKoB799dJ61x7eTVWBxQ1gduzh140CuVsiBbmqcpcLwEx3DI5bmHzwHt4ujh9WR6C9 ItS/9XZ5VmrOxjcxffU3faw= Received: from mail.maildlp.com (unknown [172.19.162.92]) by canpmsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4fxBxj4LVFzKmTk; Thu, 16 Apr 2026 17:08:09 +0800 (CST) Received: from dggemv705-chm.china.huawei.com (unknown [10.3.19.32]) by mail.maildlp.com (Postfix) with ESMTPS id 6E4A840565; Thu, 16 Apr 2026 17:14:30 +0800 (CST) Received: from kwepemq100007.china.huawei.com (7.202.195.175) by dggemv705-chm.china.huawei.com (10.3.19.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:30 +0800 Received: from localhost.huawei.com (10.169.71.169) by kwepemq100007.china.huawei.com (7.202.195.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 16 Apr 2026 17:14:29 +0800 From: Yongbang Shi To: , , , , , , , , CC: , , , , , , , , Subject: [PATCH for drm-misc-fixes v3 4/4] drm/hisilicon/hibmc: use clock to look up the PLL value Date: Thu, 16 Apr 2026 17:05:42 +0800 Message-ID: <20260416090542.1984002-5-shiyongbang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260416090542.1984002-1-shiyongbang@huawei.com> References: <20260416090542.1984002-1-shiyongbang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemq100007.china.huawei.com (7.202.195.175) Content-Type: text/plain; charset="utf-8" From: Lin He In the past, we use width and height to look up our PLL value. But actually the actual clock check is also necessnary. There are some resolutions that width and height same, but its clock different. Add the clock check when using pll_table to determine the PLL value. Fixes: da52605eea8f ("drm/hisilicon/hibmc: Add support for display engine") Signed-off-by: Lin He Signed-off-by: Yongbang Shi --- ChangeLog: v2 -> v3: - remove unused macro CLOCK_TOLERANCE. v1 -> v2: - remove tag "Reviewed-by: Tao Tian ", witch will be given in public. - add 'drm-misc-fixes' in subject prefix. --- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 78 +++++++++++-------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/d= rm/hisilicon/hibmc/hibmc_drm_de.c index 89bed78f1466..1a07e8146eee 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -32,26 +32,43 @@ struct hibmc_display_panel_pll { struct hibmc_dislay_pll_config { u64 hdisplay; u64 vdisplay; + int clock; u32 pll1_config_value; u32 pll2_config_value; }; =20 static const struct hibmc_dislay_pll_config hibmc_pll_table[] =3D { - {640, 480, CRT_PLL1_HS_25MHZ, CRT_PLL2_HS_25MHZ}, - {800, 600, CRT_PLL1_HS_40MHZ, CRT_PLL2_HS_40MHZ}, - {1024, 768, CRT_PLL1_HS_65MHZ, CRT_PLL2_HS_65MHZ}, - {1152, 864, CRT_PLL1_HS_80MHZ_1152, CRT_PLL2_HS_80MHZ}, - {1280, 768, CRT_PLL1_HS_80MHZ, CRT_PLL2_HS_80MHZ}, - {1280, 720, CRT_PLL1_HS_74MHZ, CRT_PLL2_HS_74MHZ}, - {1280, 960, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, - {1280, 1024, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, - {1440, 900, CRT_PLL1_HS_106MHZ, CRT_PLL2_HS_106MHZ}, - {1600, 900, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, - {1600, 1200, CRT_PLL1_HS_162MHZ, CRT_PLL2_HS_162MHZ}, - {1920, 1080, CRT_PLL1_HS_148MHZ, CRT_PLL2_HS_148MHZ}, - {1920, 1200, CRT_PLL1_HS_193MHZ, CRT_PLL2_HS_193MHZ}, + {640, 480, 25000, CRT_PLL1_HS_25MHZ, CRT_PLL2_HS_25MHZ}, + {800, 600, 40000, CRT_PLL1_HS_40MHZ, CRT_PLL2_HS_40MHZ}, + {1024, 768, 65000, CRT_PLL1_HS_65MHZ, CRT_PLL2_HS_65MHZ}, + {1152, 864, 78750, CRT_PLL1_HS_80MHZ_1152, CRT_PLL2_HS_80MHZ}, + {1280, 768, 80000, CRT_PLL1_HS_80MHZ, CRT_PLL2_HS_80MHZ}, + {1280, 720, 74375, CRT_PLL1_HS_74MHZ, CRT_PLL2_HS_74MHZ}, + {1280, 960, 108000, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, + {1280, 1024, 108000, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, + {1440, 900, 105952, CRT_PLL1_HS_106MHZ, CRT_PLL2_HS_106MHZ}, + {1600, 900, 108000, CRT_PLL1_HS_108MHZ, CRT_PLL2_HS_108MHZ}, + {1600, 1200, 162500, CRT_PLL1_HS_162MHZ, CRT_PLL2_HS_162MHZ}, + {1920, 1080, 148750, CRT_PLL1_HS_148MHZ, CRT_PLL2_HS_148MHZ}, + {1920, 1200, 193750, CRT_PLL1_HS_193MHZ, CRT_PLL2_HS_193MHZ}, }; =20 +static int hibmc_get_best_clock_idx(const struct drm_display_mode *mode) +{ + int i, diff; + + for (i =3D 0; i < ARRAY_SIZE(hibmc_pll_table); i++) { + if (hibmc_pll_table[i].hdisplay =3D=3D mode->hdisplay && + hibmc_pll_table[i].vdisplay =3D=3D mode->vdisplay) { + diff =3D abs(mode->clock - hibmc_pll_table[i].clock); + if (diff < mode->clock / 100) /* tolerance 1/100 */ + return i; + } + } + + return -EOPNOTSUPP; +} + static int hibmc_plane_atomic_check(struct drm_plane *plane, struct drm_atomic_state *state) { @@ -214,17 +231,13 @@ static enum drm_mode_status hibmc_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) { - size_t i =3D 0; int vrefresh =3D drm_mode_vrefresh(mode); =20 if (vrefresh < 59 || vrefresh > 61) return MODE_NOCLOCK; =20 - for (i =3D 0; i < ARRAY_SIZE(hibmc_pll_table); i++) { - if (hibmc_pll_table[i].hdisplay =3D=3D mode->hdisplay && - hibmc_pll_table[i].vdisplay =3D=3D mode->vdisplay) - return MODE_OK; - } + if (hibmc_get_best_clock_idx(mode) >=3D 0) + return MODE_OK; =20 return MODE_BAD; } @@ -281,23 +294,20 @@ static void set_vclock_hisilicon(struct drm_device *d= ev, u64 pll) writel(val, priv->mmio + CRT_PLL1_HS); } =20 -static void get_pll_config(u64 x, u64 y, u32 *pll1, u32 *pll2) +static void get_pll_config(struct drm_display_mode *mode, u32 *pll1, u32 *= pll2) { - size_t i; - size_t count =3D ARRAY_SIZE(hibmc_pll_table); - - for (i =3D 0; i < count; i++) { - if (hibmc_pll_table[i].hdisplay =3D=3D x && - hibmc_pll_table[i].vdisplay =3D=3D y) { - *pll1 =3D hibmc_pll_table[i].pll1_config_value; - *pll2 =3D hibmc_pll_table[i].pll2_config_value; - return; - } + int idx; + + idx =3D hibmc_get_best_clock_idx(mode); + if (idx < 0) { + /* if found none, we use default value */ + *pll1 =3D CRT_PLL1_HS_25MHZ; + *pll2 =3D CRT_PLL2_HS_25MHZ; + return; } =20 - /* if found none, we use default value */ - *pll1 =3D CRT_PLL1_HS_25MHZ; - *pll2 =3D CRT_PLL2_HS_25MHZ; + *pll1 =3D hibmc_pll_table[idx].pll1_config_value; + *pll2 =3D hibmc_pll_table[idx].pll2_config_value; } =20 /* @@ -319,7 +329,7 @@ static u32 display_ctrl_adjust(struct drm_device *dev, x =3D mode->hdisplay; y =3D mode->vdisplay; =20 - get_pll_config(x, y, &pll1, &pll2); + get_pll_config(mode, &pll1, &pll2); writel(pll2, priv->mmio + CRT_PLL2_HS); set_vclock_hisilicon(dev, pll1); =20 --=20 2.33.0