From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (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 236C119C569 for ; Mon, 24 Mar 2025 13:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742823203; cv=none; b=nUpx/KaP1urh5zhRwgLBIMWXqIstheqApQv7qW3JyHyq8gHpOTKSUuj2R9waJAQ0SE8jFP4HiZr+nWhGNd1JhexU/oSVCbHOMS0iB6gWn+DM+FpZTy9p+rS50YZXPmZR8SgQVA6sW2ZBFWCDTlJAxXZrYvsyUcAaspwkXAVbDd8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742823203; c=relaxed/simple; bh=672I3/+hGrCRodDTgPKh2B6jZ5R+Fb8/Nlctlz3nabc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=X+j0HJGne0eCIEZ13/+vRVz09bHK0DTWia0NNeKJ/ddKMF5d5jlYBVSNc7zge5V5/xL5Fto0CRoYc/sGJF3aC83k1BGjfRyP9g9vPZogDceoAYNOFIrEa1ol62AquySo80iG+/uQ8Hnl+SnodqBp59AcFHWAkdDyfxpf/YMfiCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ErbaNGnp; arc=none smtp.client-ip=198.175.65.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ErbaNGnp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742823203; x=1774359203; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=672I3/+hGrCRodDTgPKh2B6jZ5R+Fb8/Nlctlz3nabc=; b=ErbaNGnpIe7Fvkj3rVGxaDgWCi6PgGMhrwOxT7JDzf0vljG1HHQmm8YK ZYIbNLjDhDNUOMDYbObOSD7ljt9mz6fZZi9hHfN2zZ56UdDY4RVz370tD HZDr06c97uJC7xYFyGqvWYAAM0KahMcjgA2EU48rlQ3ubMlL0U4QCkRTV kxyKmUVJmK/7iPrFO3OSwnKQ6TwrUT/93/VFCFSx6F4HeXyqMPUXEv/PI rFWvcZpoguPgOOLgd+azH+PiHU1Z1tP4Bipg+KVRhtY+TX+xDpkFavxU+ M1zrFtsqjRJ3LaFrwBqLXXib/1ixjTbbmb3QHBL4pI4Z9zPXBT59okzgL w==; X-CSE-ConnectionGUID: /QxKiwS7Si2KqQ+1CDmicA== X-CSE-MsgGUID: 4TicbbUATZaTOkTkMDIRhg== X-IronPort-AV: E=McAfee;i="6700,10204,11383"; a="44191547" X-IronPort-AV: E=Sophos;i="6.14,272,1736841600"; d="scan'208";a="44191547" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2025 06:33:22 -0700 X-CSE-ConnectionGUID: HUyPZEDVRdmRhrgXUv8/oA== X-CSE-MsgGUID: f0vnuuvITZ6BvwyGfdDnVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,272,1736841600"; d="scan'208";a="128227255" Received: from kniemiec-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.30]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2025 06:33:16 -0700 From: Jani Nikula To: Yongbang Shi , xinliang.liu@linaro.org, tiantao6@hisilicon.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, kong.kongxinwei@hisilicon.com Cc: liangjian010@huawei.com, chenjianmin@huawei.com, lidongming5@huawei.com, libaihan@huawei.com, shenjian15@huawei.com, shaojijie@huawei.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, shiyongbang@huawei.com Subject: Re: [PATCH v7 drm-dp 5/9] drm/hisilicon/hibmc: Getting connector info and EDID by using AUX channel In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250319032435.1119469-1-shiyongbang@huawei.com> <20250319032435.1119469-6-shiyongbang@huawei.com> <87frj8c9ol.fsf@intel.com> Date: Mon, 24 Mar 2025 15:33:13 +0200 Message-ID: <87jz8ea6zq.fsf@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Mon, 24 Mar 2025, Yongbang Shi wrote: >> On Wed, 19 Mar 2025, Yongbang Shi wrote: >>> From: Baihan Li >>> >>> Add registering drm_aux and use it to get connector edid with drm >>> functions. Add ddc channel in connector initialization to put drm_aux >>> in drm_connector. >>> >>> Signed-off-by: Baihan Li >>> Signed-off-by: Yongbang Shi >>> Reviewed-by: Dmitry Baryshkov >>> --- >>> ChangeLog: >>> v6 -> v7: >>> - add if statement about drm aux in hibmc_dp_connector_get_modes(), suggested by Jani Nikula >> I don't understand this, and I did not suggest such a thing. >> >> BR, >> Jani. >> > Hi Jani, > > Is the modification of v8 correct? I never received that for whatever reason. > > >>> v5 -> v6: >>> - move the detect_ctx() to the patch 7/9. >>> v2 -> v3: >>> - Capitalized EDID and AUX, suggested by Dmitry Baryshkov. >>> v1 -> v2: >>> - deleting type conversion, suggested by Dmitry Baryshkov. >>> - deleting hibmc_dp_connector_get_modes() and using drm_connector_helper_get_modes(), suggested by Dmitry Baryshkov. >>> --- >>> drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c | 3 +- >>> .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 35 ++++++++++++++++--- >>> .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 5 +++ >>> 3 files changed, 37 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c >>> index ded9e7ce887a..e0bb9b14d9d8 100644 >>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c >>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c >>> @@ -161,7 +161,8 @@ void hibmc_dp_aux_init(struct hibmc_dp *dp) >>> HIBMC_DP_MIN_PULSE_NUM); >>> >>> dp->aux.transfer = hibmc_dp_aux_xfer; >>> - dp->aux.is_remote = 0; >>> + dp->aux.name = kasprintf(GFP_KERNEL, "HIBMC DRM dp aux"); >>> + dp->aux.drm_dev = dp->drm_dev; >>> drm_dp_aux_init(&dp->aux); >>> dp->dp_dev->aux = &dp->aux; >>> } >>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >>> index 603d6b198a54..0256724d8b9b 100644 >>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c >>> @@ -15,11 +15,20 @@ >>> >>> static int hibmc_dp_connector_get_modes(struct drm_connector *connector) >>> { >>> + struct hibmc_dp *dp = to_hibmc_dp(connector); >>> + const struct drm_edid *drm_edid; >>> 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 >>> + if (!dp->aux.name) >>> + return 0; >>> + >>> + drm_edid = drm_edid_read_ddc(connector, &dp->aux.ddc); >>> + >>> + drm_edid_connector_update(connector, drm_edid); >>> + >>> + count = drm_edid_connector_add_modes(connector); >>> + >>> + drm_edid_free(drm_edid); >>> >>> return count; >>> } >>> @@ -28,12 +37,28 @@ static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = { >>> .get_modes = hibmc_dp_connector_get_modes, >>> }; >>> >>> +static int hibmc_dp_late_register(struct drm_connector *connector) >>> +{ >>> + struct hibmc_dp *dp = to_hibmc_dp(connector); >>> + >>> + return drm_dp_aux_register(&dp->aux); >>> +} >>> + >>> +static void hibmc_dp_early_unregister(struct drm_connector *connector) >>> +{ >>> + struct hibmc_dp *dp = to_hibmc_dp(connector); >>> + >>> + drm_dp_aux_unregister(&dp->aux); >>> +} >>> + >>> 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, >>> + .late_register = hibmc_dp_late_register, >>> + .early_unregister = hibmc_dp_early_unregister, >>> }; >>> >>> static inline int hibmc_dp_prepare(struct hibmc_dp *dp, struct drm_display_mode *mode) >>> @@ -103,8 +128,8 @@ int hibmc_dp_init(struct hibmc_drm_private *priv) >>> >>> drm_encoder_helper_add(encoder, &hibmc_dp_encoder_helper_funcs); >>> >>> - ret = drm_connector_init(dev, connector, &hibmc_dp_conn_funcs, >>> - DRM_MODE_CONNECTOR_DisplayPort); >>> + ret = drm_connector_init_with_ddc(dev, connector, &hibmc_dp_conn_funcs, >>> + DRM_MODE_CONNECTOR_DisplayPort, &dp->aux.ddc); >>> if (ret) { >>> drm_err(dev, "init dp connector failed: %d\n", ret); >>> return ret; >>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >>> index d982f1e4b958..3ddd71aada66 100644 >>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h >>> @@ -47,6 +47,11 @@ static inline struct hibmc_vdac *to_hibmc_vdac(struct drm_connector *connector) >>> return container_of(connector, struct hibmc_vdac, connector); >>> } >>> >>> +static inline struct hibmc_dp *to_hibmc_dp(struct drm_connector *connector) >>> +{ >>> + return container_of(connector, struct hibmc_dp, connector); >>> +} >>> + >>> static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device *dev) >>> { >>> return container_of(dev, struct hibmc_drm_private, dev); -- Jani Nikula, Intel