From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 DA9D41DE2DE; Tue, 3 Dec 2024 14:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733235977; cv=none; b=bh+sCb4hSvm7iyHFwyGOEcI6YMSfRkqs+17NEEWMpEZ8LRGd3QfLjbux1eDD1/HUy++CNdtPJo1SuZXBlgqLgEe870M9kAeLL17dhfdnsUZzBjnzCYY1U7XccwSZRflosWOKC7oa3olzLm7roh0D0u8hRJT35c8p31ZBAVgKMow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733235977; c=relaxed/simple; bh=uMWXhqZwProDmwOA4vHMhW1QbQjGRI1y8AQlSmfmBzk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=lSTHu0i3EfNoC03UTXJ89niFmdz4Z/pQqMTqFExTxuDMMqAHfL6ihrdOqTTzCyO/6RSYsv9jVghmLUIMBhnBJDq2P3L1gqJ3uZtm3gBq10DwxIfe2SGT6bXLlDw1TUW9yEcDQlpAoXMrVXoTAejJN4SSWiUj0Mjy3mYwd7LNu78= 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=MpTFppr8; arc=none smtp.client-ip=198.175.65.13 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="MpTFppr8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733235975; x=1764771975; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=uMWXhqZwProDmwOA4vHMhW1QbQjGRI1y8AQlSmfmBzk=; b=MpTFppr83dSNSiFrbOPkdaeMs+g5A3Iv9MsRG03UbzMZFHS/K/GiicXL lfTI6oDrwtwxh8w9iMqFWcm8pyKar4hC0oN/to8vcQGPOcDdjKJznMGVk oHenfYDCq/fbv4kSiIO/lhLExHpinCJPQnXkHOg5UCpQgy2BcVHUij7HK F9wMQXRD6qMJhtn5kwQdvPiQ4DkI2B2CPtfHvgLaqw55UR5X4Iq9c7dBQ YDjytlPIqR9LrpaH3ayT7PHzq2z4yndB9+OjjO3EvXpVpeCqTRNQBXmey CWhgSgk2XukKb4U2i2tQfB2GMSdSG+dE2c4/MoSCTTUC6sNtn2koLZWYc Q==; X-CSE-ConnectionGUID: tVipUhtRS0qxYbBudEaBcQ== X-CSE-MsgGUID: Uari58hYQaq2DzPy1zRnQQ== X-IronPort-AV: E=McAfee;i="6700,10204,11275"; a="44480677" X-IronPort-AV: E=Sophos;i="6.12,205,1728975600"; d="scan'208";a="44480677" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2024 06:26:13 -0800 X-CSE-ConnectionGUID: aDPdg6NdRb+ONzW7kLZxAQ== X-CSE-MsgGUID: Tuwzy8/pRA2RVBUpHZa5NQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,205,1728975600"; d="scan'208";a="93328558" Received: from kniemiec-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.135]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2024 06:26:01 -0800 From: Jani Nikula To: Dmitry Baryshkov , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Phong LE , Inki Dae , Seung-Woo Kim , Kyungmin Park , Krzysztof Kozlowski , Alim Akhtar , Russell King , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Sandy Huang , Heiko =?utf-8?Q?St=C3=BCbner?= , Andy Yan , Alain Volmat , Raphael Gallais-Pou , Dave Stevenson , =?utf-8?Q?Ma=C3=ADra?= Canal , Raspberry Pi Kernel Maintenance Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: Re: [PATCH v5 7/9] drm/bridge_connector: hook drm_atomic_helper_connector_hdmi_update_edid() In-Reply-To: <20241201-drm-bridge-hdmi-connector-v5-7-b5316e82f61a@linaro.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20241201-drm-bridge-hdmi-connector-v5-0-b5316e82f61a@linaro.org> <20241201-drm-bridge-hdmi-connector-v5-7-b5316e82f61a@linaro.org> Date: Tue, 03 Dec 2024 16:25:58 +0200 Message-ID: <87a5dc4zd5.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 Sun, 01 Dec 2024, Dmitry Baryshkov wrote: > Extend drm_bridge_connector code to read the EDID and use it to update > connector status if the bridge chain implements HDMI bridge. Performing > it from the generic location minimizes individual bridge's code and > enforces standard behaviour from all corresponding drivers. > > Signed-off-by: Dmitry Baryshkov > --- > drivers/gpu/drm/display/drm_bridge_connector.c | 67 ++++++++++++++++++++------ > 1 file changed, 53 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c > index 12ab9f14cc8a8672478ae2804c9a68d766d88ea5..71ae3b2c9049016d1cc0d39a787f6461633efd53 100644 > --- a/drivers/gpu/drm/display/drm_bridge_connector.c > +++ b/drivers/gpu/drm/display/drm_bridge_connector.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -175,17 +176,55 @@ static void drm_bridge_connector_disable_hpd(struct drm_connector *connector) > * Bridge Connector Functions > */ > > +static const struct drm_edid * > +drm_bridge_connector_read_edid(struct drm_connector *connector, > + enum drm_connector_status status) > +{ > + struct drm_bridge_connector *bridge_connector = > + to_drm_bridge_connector(connector); > + const struct drm_edid *drm_edid; > + struct drm_bridge *bridge; > + > + bridge = bridge_connector->bridge_edid; > + if (!bridge) > + return NULL; > + > + if (status != connector_status_connected) > + return NULL; > + > + drm_edid = drm_bridge_edid_read(bridge, connector); > + if (!drm_edid_valid(drm_edid)) { What's the case this check is for? My preference would be that bridge->funcs->edid_read() uses drm_edid_read*() family of functions that do the checks and return the EDID. There are some cases that just allocate a blob and return it. Would be nice if they could be converted, but in the mean time could use drm_edid_valid() right there. Additional validity checks are redundant. BR, Jani. > + drm_edid_free(drm_edid); > + return NULL; > + } > + > + return drm_edid; > +} > + > static enum drm_connector_status > drm_bridge_connector_detect(struct drm_connector *connector, bool force) > { > struct drm_bridge_connector *bridge_connector = > to_drm_bridge_connector(connector); > struct drm_bridge *detect = bridge_connector->bridge_detect; > + struct drm_bridge *hdmi = bridge_connector->bridge_hdmi; > enum drm_connector_status status; > > if (detect) { > status = detect->funcs->detect(detect); > > + if (hdmi) { > + const struct drm_edid *drm_edid; > + int ret; > + > + drm_edid = drm_bridge_connector_read_edid(connector, status); > + ret = drm_atomic_helper_connector_hdmi_update_edid(connector, drm_edid); > + if (ret) > + drm_warn(connector->dev, "updating EDID failed with %d\n", ret); > + > + drm_edid_free(drm_edid); > + } > + > drm_bridge_connector_hpd_notify(connector, status); > } else { > switch (connector->connector_type) { > @@ -246,29 +285,29 @@ static const struct drm_connector_funcs drm_bridge_connector_funcs = { > static int drm_bridge_connector_get_modes_edid(struct drm_connector *connector, > struct drm_bridge *bridge) > { > + struct drm_bridge_connector *bridge_connector = > + to_drm_bridge_connector(connector); > + struct drm_bridge *hdmi = bridge_connector->bridge_hdmi; > enum drm_connector_status status; > const struct drm_edid *drm_edid; > - int n; > > status = drm_bridge_connector_detect(connector, false); > if (status != connector_status_connected) > - goto no_edid; > + return 0; > > - drm_edid = drm_bridge_edid_read(bridge, connector); > - if (!drm_edid_valid(drm_edid)) { > + /* In HDMI setup the EDID has been read and handled as a part of .detect() */ > + if (!hdmi) { > + drm_edid = drm_bridge_connector_read_edid(connector, status); > + if (!drm_edid) { > + drm_edid_connector_update(connector, NULL); > + return 0; > + } > + > + drm_edid_connector_update(connector, drm_edid); > drm_edid_free(drm_edid); > - goto no_edid; > } > > - drm_edid_connector_update(connector, drm_edid); > - n = drm_edid_connector_add_modes(connector); > - > - drm_edid_free(drm_edid); > - return n; > - > -no_edid: > - drm_edid_connector_update(connector, NULL); > - return 0; > + return drm_edid_connector_add_modes(connector); > } > > static int drm_bridge_connector_get_modes(struct drm_connector *connector) -- Jani Nikula, Intel