From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 DCFB41FCFE7 for ; Mon, 2 Dec 2024 11:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138049; cv=none; b=hlYNnqNzn7yK94aILZNP/eqZHT27cIqFx435KEL5WeFBwb7KkTYpuWUvcQwXIK/139WcBVdBxTdARQpwiRslc88nb6k8vHhNkv6n4QjiiMiFMVW/0gCbgzQWnZluQuDgBxN9V+4WMpD9Z4SE2UfS4AgsQthunibmSzkTzXZEW0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138049; c=relaxed/simple; bh=/x9JeNifXoxbdAweEfQu4IEi5Jh/IFckW8ZgEWTgTd4=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=bFxhh334lDkc190w4BDRexMy2WPIHmi+1IeMGaoykKCbLhaW4FjT83uMa0YesnbVPIvocD5Uyevoa+EALl0joI5z8yxtyQlQEN3KxOtYXKMx2DgKnq1tuuGaBQZXPhXAqD83DY7UXTbFPZBrK3tauGYbARa3rkBu4Qqt9VyD7zY= 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; arc=none smtp.client-ip=45.249.212.188 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 Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Y21LM4zCXzPpxH; Mon, 2 Dec 2024 19:11:07 +0800 (CST) Received: from kwepemd500013.china.huawei.com (unknown [7.221.188.12]) by mail.maildlp.com (Postfix) with ESMTPS id 9BFFF1800A2; Mon, 2 Dec 2024 19:13:56 +0800 (CST) Received: from [10.159.166.136] (10.159.166.136) by kwepemd500013.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Mon, 2 Dec 2024 19:13:55 +0800 Message-ID: Date: Mon, 2 Dec 2024 19:13:54 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 drm-dp 5/5] drm/hisilicon/hibmc: add dp module in hibmc To: Dmitry Baryshkov CC: , , , , , , , , , , , , , , , , References: <20241118142805.3326443-1-shiyongbang@huawei.com> <20241118142805.3326443-6-shiyongbang@huawei.com> From: Yongbang Shi In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd500013.china.huawei.com (7.221.188.12) > On Mon, Nov 18, 2024 at 10:28:05PM +0800, Yongbang Shi wrote: >> From: baihan li >> >> To support DP interface displaying in hibmc driver. Add >> a encoder and connector for DP modual. >> >> Signed-off-by: Baihan Li >> Signed-off-by: Yongbang Shi >> --- >> ChangeLog: >> v3 -> v4: >> - static inline hibmc_dp_prepare(), suggested by Dmitry Baryshkov. >> --- >> drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- >> .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 118 ++++++++++++++++++ >> .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 12 ++ >> .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 5 + >> 4 files changed, 136 insertions(+), 1 deletion(-) >> create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >> >> diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile >> index 214228052ccf..95a4ed599d98 100644 >> --- a/drivers/gpu/drm/hisilicon/hibmc/Makefile >> +++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile >> @@ -1,5 +1,5 @@ >> # SPDX-License-Identifier: GPL-2.0-only >> hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_i2c.o \ >> - dp/dp_aux.o dp/dp_link.o dp/dp_hw.o >> + dp/dp_aux.o dp/dp_link.o dp/dp_hw.o hibmc_drm_dp.o >> >> obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o >> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >> new file mode 100644 >> index 000000000000..603d6b198a54 >> --- /dev/null >> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >> @@ -0,0 +1,118 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +// Copyright (c) 2024 Hisilicon Limited. >> + >> +#include >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include "hibmc_drm_drv.h" >> +#include "dp/dp_hw.h" >> + >> +static int hibmc_dp_connector_get_modes(struct drm_connector *connector) >> +{ >> + int count; >> + >> + count = drm_add_modes_noedid(connector, connector->dev->mode_config.max_width, >> + connector->dev->mode_config.max_height); >> + drm_set_preferred_mode(connector, 1024, 768); // temporary implementation > Ideally this should be mentioned in the commit message. > >> + >> + return count; >> +} >> + >> +static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = { >> + .get_modes = hibmc_dp_connector_get_modes, >> +}; >> + >> +static const struct drm_connector_funcs hibmc_dp_conn_funcs = { >> + .reset = drm_atomic_helper_connector_reset, >> + .fill_modes = drm_helper_probe_single_connector_modes, >> + .destroy = drm_connector_cleanup, >> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, >> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > No .detect / .detect_ctx ? No HPD support? Is it being targeted the DP > or eDP cases? Hi Dmitry, Thanks for your asking. Yes, I will add hpd and get edid functions in next patch, and I will mention these in the commit message in v6. Sincerely, Baihan Li >> +}; >> + >> +static inline int hibmc_dp_prepare(struct hibmc_dp *dp, struct drm_display_mode *mode) >> +{ >> + int ret; >> + >> + hibmc_dp_display_en(dp, false); >> + >> + ret = hibmc_dp_mode_set(dp, mode); >> + if (ret) >> + drm_err(dp->drm_dev, "hibmc dp mode set failed: %d\n", ret); >> + >> + return ret; >> +} >> + >> +static void hibmc_dp_encoder_enable(struct drm_encoder *drm_encoder, >> + struct drm_atomic_state *state) >> +{ >> + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); >> + struct drm_display_mode *mode = &drm_encoder->crtc->state->mode; >> + >> + if (hibmc_dp_prepare(dp, mode)) >> + return; >> + >> + hibmc_dp_display_en(dp, true); >> +} >> + >> +static void hibmc_dp_encoder_disable(struct drm_encoder *drm_encoder, >> + struct drm_atomic_state *state) >> +{ >> + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); >> + >> + hibmc_dp_display_en(dp, false); >> +} >> + >> +static const struct drm_encoder_helper_funcs hibmc_dp_encoder_helper_funcs = { >> + .atomic_enable = hibmc_dp_encoder_enable, >> + .atomic_disable = hibmc_dp_encoder_disable, >> +}; >> + >> +int hibmc_dp_init(struct hibmc_drm_private *priv) >> +{ >> + struct drm_device *dev = &priv->dev; >> + struct drm_crtc *crtc = &priv->crtc; >> + struct hibmc_dp *dp = &priv->dp; >> + struct drm_connector *connector = &dp->connector; >> + struct drm_encoder *encoder = &dp->encoder; >> + int ret; >> + >> + dp->mmio = priv->mmio; >> + dp->drm_dev = dev; >> + >> + ret = hibmc_dp_hw_init(&priv->dp); >> + if (ret) { >> + drm_err(dev, "hibmc dp hw init failed: %d\n", ret); >> + return ret; >> + } >> + >> + hibmc_dp_display_en(&priv->dp, false); >> + >> + encoder->possible_crtcs = drm_crtc_mask(crtc); >> + ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_TMDS, NULL); >> + if (ret) { >> + drm_err(dev, "init dp encoder failed: %d\n", ret); >> + return ret; >> + } >> + >> + drm_encoder_helper_add(encoder, &hibmc_dp_encoder_helper_funcs); >> + >> + ret = drm_connector_init(dev, connector, &hibmc_dp_conn_funcs, >> + DRM_MODE_CONNECTOR_DisplayPort); >> + if (ret) { >> + drm_err(dev, "init dp connector failed: %d\n", ret); >> + return ret; >> + } >> + >> + drm_connector_helper_add(connector, &hibmc_dp_conn_helper_funcs); >> + >> + drm_connector_attach_encoder(connector, encoder); >> + >> + return 0; >> +} >> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c >> index 9f9b19ea0587..39fd8c5c8227 100644 >> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c >> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c >> @@ -27,6 +27,10 @@ >> #include "hibmc_drm_drv.h" >> #include "hibmc_drm_regs.h" >> >> +#define HIBMC_DP_HOST_SERDES_CTRL 0x1f001c >> +#define HIBMC_DP_HOST_SERDES_CTRL_VAL 0x8A00 >> +#define HIBMC_DP_HOST_SERDES_CTRL_MASK 0x7FFFF >> + >> DEFINE_DRM_GEM_FOPS(hibmc_fops); >> >> static irqreturn_t hibmc_interrupt(int irq, void *arg) >> @@ -116,6 +120,14 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) >> return ret; >> } >> >> + /* if DP existed, init DP */ >> + if ((readl(priv->mmio + HIBMC_DP_HOST_SERDES_CTRL) & >> + HIBMC_DP_HOST_SERDES_CTRL_MASK) == HIBMC_DP_HOST_SERDES_CTRL_VAL) { >> + ret = hibmc_dp_init(priv); >> + if (ret) >> + drm_err(dev, "failed to init dp: %d\n", ret); >> + } >> + >> ret = hibmc_vdac_init(priv); >> if (ret) { >> drm_err(dev, "failed to init vdac: %d\n", ret); >> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >> index 42f0ab8f9b5a..d982f1e4b958 100644 >> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >> @@ -20,6 +20,8 @@ >> >> #include >> >> +#include "dp/dp_hw.h" >> + >> struct hibmc_vdac { >> struct drm_device *dev; >> struct drm_encoder encoder; >> @@ -37,6 +39,7 @@ struct hibmc_drm_private { >> struct drm_plane primary_plane; >> struct drm_crtc crtc; >> struct hibmc_vdac vdac; >> + struct hibmc_dp dp; >> }; >> >> static inline struct hibmc_vdac *to_hibmc_vdac(struct drm_connector *connector) >> @@ -59,4 +62,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv); >> >> int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *connector); >> >> +int hibmc_dp_init(struct hibmc_drm_private *priv); >> + >> #endif >> -- >> 2.33.0 >>