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 391EDC25B50 for ; Fri, 20 Jan 2023 18:49:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DC2F10EAF0; Fri, 20 Jan 2023 18:49:23 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAB9810EAF0; Fri, 20 Jan 2023 18:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674240560; x=1705776560; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=+VK9abkTdrTrrWu++w4jgEHQwyoxGEk+DIzLdXGOWGY=; b=eZGQegO/kx/DoVDnNF3L+iNgdQjstZtobB96pdbQ+xvtnBAH4lS0CGu/ nisc4jdeEtOHOOy4gyC7leRiaNxaCZlAueH+0fJvw3MjfpUrKm2eiMfpz GW9wo6cQgHGrH8EIjld0nMYmd+bX479133kyimkMuj62iDwn/DzJXgFIN agaSt/3Zg0SwEUD3a5mqrCv5HqWog4+nf33okYB1UEX8lA9ySCMayrT+q G7oIfsSFcEJ5vTHlNLsHcI5TIE3C+XQK/Gt9v+cnPTyor0A4owz/P9W1d IcKKw3BrbGXGu/8pLEahgurr2hxaYS8kXI5EXu094WUvWzZNtJ0RDCXA8 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="352915596" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="352915596" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 10:49:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="724050163" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="724050163" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.55]) by fmsmga008.fm.intel.com with SMTP; 20 Jan 2023 10:49:18 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 20 Jan 2023 20:49:17 +0200 Date: Fri, 20 Jan 2023 20:49:17 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Subject: Re: [PATCH v8 7/8] drm/i915/opregion: convert intel_opregion_get_edid() to struct drm_edid 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Jan 19, 2023 at 06:19:00PM +0200, Jani Nikula wrote: > Simplify validation and use by converting to drm_edid. > > Cc: Ville Syrjälä > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_dp.c | 10 ++----- > drivers/gpu/drm/i915/display/intel_opregion.c | 29 +++++++------------ > drivers/gpu/drm/i915/display/intel_opregion.h | 4 +-- > 3 files changed, 15 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 4cc7c04b9bda..a44eefb97e8d 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5296,18 +5296,12 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > mutex_lock(&dev_priv->drm.mode_config.mutex); > drm_edid = drm_edid_read_ddc(connector, &intel_dp->aux.ddc); > if (!drm_edid) { > - const struct edid *edid; > - > /* Fallback to EDID from ACPI OpRegion, if any */ > - /* FIXME: Make intel_opregion_get_edid() return drm_edid */ > - edid = intel_opregion_get_edid(intel_connector); > - if (edid) { > - drm_edid = drm_edid_alloc(edid, (edid->extensions + 1) * EDID_LENGTH); > + drm_edid = intel_opregion_get_edid(intel_connector); > + if (drm_edid) > drm_dbg_kms(&dev_priv->drm, > "[CONNECTOR:%d:%s] Using OpRegion EDID\n", > connector->base.id, connector->name); > - kfree(edid); > - } > } > if (drm_edid) { > if (drm_edid_connector_update(connector, drm_edid) || > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index e0184745632c..b8dce0576512 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -1101,41 +1101,34 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv) > * The EDID in the OpRegion, or NULL if there is none or it's invalid. > * > */ > -struct edid *intel_opregion_get_edid(struct intel_connector *intel_connector) > +const struct drm_edid *intel_opregion_get_edid(struct intel_connector *intel_connector) > { > struct drm_connector *connector = &intel_connector->base; > struct drm_i915_private *i915 = to_i915(connector->dev); > struct intel_opregion *opregion = &i915->display.opregion; > - const void *in_edid; > - const struct edid *edid; > - struct edid *new_edid; > + const struct drm_edid *drm_edid; > + const void *edid; > int len; > > if (!opregion->asle_ext) > return NULL; > > - in_edid = opregion->asle_ext->bddc; > + edid = opregion->asle_ext->bddc; > > /* Validity corresponds to number of 128-byte blocks */ > len = (opregion->asle_ext->phed & ASLE_PHED_EDID_VALID_MASK) * 128; > - if (!len || !memchr_inv(in_edid, 0, len)) > + if (!len || !memchr_inv(edid, 0, len)) > return NULL; > > - edid = in_edid; > + drm_edid = drm_edid_alloc(edid, len); > > - if (len < EDID_LENGTH * (1 + edid->extensions)) { > - drm_dbg_kms(&i915->drm, "Invalid EDID in ACPI OpRegion (Mailbox #5): too short\n"); > - return NULL; > - } > - new_edid = drm_edid_duplicate(edid); > - if (!new_edid) > - return NULL; > - if (!drm_edid_is_valid(new_edid)) { > - kfree(new_edid); > + if (!drm_edid_valid(drm_edid)) { > drm_dbg_kms(&i915->drm, "Invalid EDID in ACPI OpRegion (Mailbox #5)\n"); > - return NULL; > + drm_edid_free(drm_edid); > + drm_edid = NULL; > } > - return new_edid; > + > + return drm_edid; > } > > bool intel_opregion_headless_sku(struct drm_i915_private *i915) > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h > index 2f261f985400..d02e6696a050 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.h > +++ b/drivers/gpu/drm/i915/display/intel_opregion.h > @@ -74,7 +74,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, > int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv, > pci_power_t state); > int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv); > -struct edid *intel_opregion_get_edid(struct intel_connector *connector); > +const struct drm_edid *intel_opregion_get_edid(struct intel_connector *connector); > > bool intel_opregion_headless_sku(struct drm_i915_private *i915); > > @@ -123,7 +123,7 @@ static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev) > return -ENODEV; > } > > -static inline struct edid * > +static inline const struct drm_edid * > intel_opregion_get_edid(struct intel_connector *connector) > { > return NULL; > -- > 2.34.1 -- Ville Syrjälä Intel