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 51EE5FD374D for ; Wed, 25 Feb 2026 12:19:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7D7910E75B; Wed, 25 Feb 2026 12:19:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="pigXeoI1"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DB8710E758; Wed, 25 Feb 2026 12:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=qCNfPEwAGiKU96Yx+NI9AHGJhYxtzmzSW92THWvtbRk=; b=pigXeoI1qPdwwdvRByBRwmcFg7 Ro+JG+VNz8FCI6pjlwyN54sv1NuTW56PW+ObpTy2GC3DnwqvDZVxWjqZ3uqU/+BCvlOAv3pJiHA4c Mto7Ra0CydGv7s/lfnw7x6TuTmH5qSTYXyZkxpmj7QFNx4z6Myo6ZCdtpDCDPNUeweYSBEMo/MB8f BfCiuI4xad+1Nhfp717ETaRvMizlXFsGGgl0QdvoORU1wfwqBjGE96Bo7fROjjWGOm1vvdnGaHU2x 1bTg19ENVXJo6vQNLAKIRi4q4XipclAXYXv/Okr/nZooF/zEWWjPj0+X8kAtAKYkrJwhElGGxlP0f 19IrjsQA==; Received: from [186.208.68.119] (helo=killbill.home) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1vvDrQ-005DpP-UM; Wed, 25 Feb 2026 13:19:25 +0100 From: Melissa Wen To: airlied@gmail.com, alexander.deucher@amd.com, alex.hung@amd.com, andrzej.hajda@intel.com, christian.koenig@amd.com, harry.wentland@amd.com, jernej.skrabec@gmail.com, jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, maarten.lankhorst@linux.intel.com, mario.limonciello@amd.com, mripard@kernel.org, mwen@igalia.com, neil.armstrong@linaro.org, rfoss@kernel.org, simona@ffwll.ch, siqueira@igalia.com, sunpeng.li@amd.com, tzimmermann@suse.de Cc: Jani Nikula , Michel Daenzer , =?UTF-8?q?Timur=20Krist=C3=B3f?= , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-dev@igalia.com Subject: [PATCH v8 2/8] drm/amd/display: start using drm_edid helpers to parse EDID caps Date: Wed, 25 Feb 2026 09:04:31 -0300 Message-ID: <20260225121903.236115-3-mwen@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260225121903.236115-1-mwen@igalia.com> References: <20260225121903.236115-1-mwen@igalia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Groundwork that allocates a temporary drm_edid from raw edid to take advantage of DRM common-code helpers instead of driver-specific code. Signed-off-by: Melissa Wen --- v8: - centralize cleanup and return to a single place (Timur) --- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 7d0ecce6b034..ef7f27ce4b50 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -110,18 +110,21 @@ enum dc_edid_status dm_helpers_parse_edid_caps( struct drm_connector *connector = &aconnector->base; struct drm_device *dev = connector->dev; struct edid *edid_buf = edid ? (struct edid *) edid->raw_edid : NULL; + const struct drm_edid *drm_edid; struct cea_sad *sads; int sad_count = -1; int sadb_count = -1; int i = 0; uint8_t *sadb = NULL; - enum dc_edid_status result = EDID_OK; + if (!edid_caps || !edid) return EDID_BAD_INPUT; - if (!drm_edid_is_valid(edid_buf)) + drm_edid = drm_edid_alloc(edid_buf, EDID_LENGTH * (edid_buf->extensions + 1)); + + if (!drm_edid_valid(drm_edid)) result = EDID_BAD_CHECKSUM; edid_caps->manufacturer_id = (uint16_t) edid_buf->mfg_id[0] | @@ -145,8 +148,9 @@ enum dc_edid_status dm_helpers_parse_edid_caps( apply_edid_quirks(dev, edid_buf, edid_caps); sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads); - if (sad_count <= 0) - return result; + if (sad_count <= 0) { + goto cleanup; + } edid_caps->audio_mode_count = min(sad_count, DC_MAX_AUDIO_DESC_COUNT); for (i = 0; i < edid_caps->audio_mode_count; ++i) { @@ -173,6 +177,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps( kfree(sads); kfree(sadb); +cleanup: + drm_edid_free(drm_edid); return result; } -- 2.51.0