From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 292C0C4332F for ; Tue, 20 Dec 2022 12:36:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D532510E099; Tue, 20 Dec 2022 12:36:27 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FC4C10E099; Tue, 20 Dec 2022 12:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671539781; x=1703075781; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=DoA/cand5GZK1y2u65AYXJaJ79LjAAVyBESYmM0f8fA=; b=iqcH8poEbgu1jqlrgRrnhVf0Y87lmpqyWyVoK50OFQB6Htcrp+PE7mzx xO77quNxhvYv7Svk7mn9D744OGDUL7tt+BFylqlaLBUM9VC7WTEMo/t6d n5fa+o7CMQH02v9GRLQoXHup1ThVSwxaLNahlyf+NvwpH0nrM0Ygcbp0K lenNVBE+UieeFz9keZWPowwgfDZ1YE40v+fHm4vh9p+MHUY5Xie7i/Mj2 PQ5tFV0tl0XhJEVFAZgkD13sQ4+Dc3rlR+xSNCoejaMAj4Y7kYdrcliLC N90T5t054jqMxx+3KE346PITaLRD843c6XnmrKvAk2mq2qA2Iavbgy85M Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="299277046" X-IronPort-AV: E=Sophos;i="5.96,259,1665471600"; d="scan'208";a="299277046" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2022 04:36:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="714402787" X-IronPort-AV: E=Sophos;i="5.96,259,1665471600"; d="scan'208";a="714402787" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.191]) by fmsmga008.fm.intel.com with SMTP; 20 Dec 2022 04:36:18 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 20 Dec 2022 14:36:17 +0200 Date: Tue, 20 Dec 2022 14:36:17 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v6 06/12] drm/edid: refactor _drm_edid_connector_update() and rename X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Dec 16, 2022 at 06:00:20PM +0200, Jani Nikula wrote: > By moving update_display_info() out of _drm_edid_connector_update() we > make the function purely about adding modes. I don't think that's quite true. The 4:2:0 stuff still updates various display_info things from the mode parsing functions. > Rename accordingly. > > Cc: Imre Deak > Cc: Ville Syrjälä > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/drm_edid.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 15f69c362fc3..4ebfd7212bce 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -6575,19 +6575,12 @@ static int add_displayid_detailed_modes(struct drm_connector *connector, > return num_modes; > } > > -static int _drm_edid_connector_update(struct drm_connector *connector, > - const struct drm_edid *drm_edid) > +static int _drm_edid_connector_add_modes(struct drm_connector *connector, > + const struct drm_edid *drm_edid) > { > const struct drm_display_info *info = &connector->display_info; > int num_modes = 0; > > - /* > - * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks. > - * To avoid multiple parsing of same block, lets parse that map > - * from sink info, before parsing CEA modes. > - */ > - update_display_info(connector, drm_edid); > - > if (!drm_edid) > return 0; > > @@ -6692,7 +6685,9 @@ int drm_edid_connector_update(struct drm_connector *connector, > { > int count; > > - count = _drm_edid_connector_update(connector, drm_edid); > + update_display_info(connector, drm_edid); > + > + count = _drm_edid_connector_add_modes(connector, drm_edid); > > _drm_update_tile_info(connector, drm_edid); > > @@ -6762,7 +6757,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property); > */ > int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) > { > - struct drm_edid drm_edid; > + struct drm_edid _drm_edid; > + const struct drm_edid *drm_edid; > > if (edid && !drm_edid_is_valid(edid)) { > drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n", > @@ -6770,8 +6766,11 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) > edid = NULL; > } > > - return _drm_edid_connector_update(connector, > - drm_edid_legacy_init(&drm_edid, edid)); > + drm_edid = drm_edid_legacy_init(&_drm_edid, edid); > + > + update_display_info(connector, drm_edid); > + > + return _drm_edid_connector_add_modes(connector, drm_edid); > } > EXPORT_SYMBOL(drm_add_edid_modes); > > -- > 2.34.1 -- Ville Syrjälä Intel