From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 97F2A1EFF9B for ; Wed, 31 Dec 2025 16:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767198570; cv=none; b=smyW+gUNpnQJYrHRNDpmwLsbcQlA4gNP55YUired7aAAnZ1HeG07LpK2mvLsHhTnz4VXfWj4jHLQEIzzOzG++kByspVWxuYsdcSafyZBkNX55zrufzPa6XEiaRZ4JNKm6YBzxdOCkP+BLrRTXqNGMOTunNA4tOph7VJyIosYv04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767198570; c=relaxed/simple; bh=kUadBEXnLZdgoDOd8kgTz8e4gYPPYsKejtUeQ36+Qm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Wd/UBIv0Z2B3n/kvh4Ych0xAYr+H7lydkdkjZQYLep0vjSG//UsJjwptu6N5t73x2a8l54swaxaZpsDHsBcZBEPMUmXeTFA7CMkkHsNRmr9W9y1+O8bt6AOmT05zp7zZmJawiu9xrJDDq78516TR2IEC/T0kRKIWS7pJUHSKjDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s4kiSZgL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s4kiSZgL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82FF6C113D0; Wed, 31 Dec 2025 16:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767198570; bh=kUadBEXnLZdgoDOd8kgTz8e4gYPPYsKejtUeQ36+Qm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4kiSZgLOQB3m3MTj8Z+SCIshLbm1vjxMsRPBW6tsumk9B0Yq1Efl1K99kNC5DAgY h4JNwTEx421D5b0qwwTbjsr+J+cZ2CGOrpHQP5Xpzm1gRVMHWQHYAefmdWPvmVhnIE 8pd0UgqvnV1zzFCSzDgAUctG0/XRcOMxX8nYLiqgM3uF6WFg7FHIaWN8PYTJunr5re BWS5EUg9ujAt09VoNUQ2JKXOVHQeGKICZRmwAo84HTpYijm9hHarv/4dYfijnFLAY+ JIdskoAGIs/JEuHhhnMxXFBr4Qq+CTy0bUWinx1rEed85VOkO6GnZ04azrdHOw/dXz t/3YmijA4jMZw== From: Sasha Levin To: stable@vger.kernel.org Cc: Jani Nikula , =?UTF-8?q?Tiago=20Martins=20Ara=C3=BAjo?= , Alex Deucher , Sasha Levin Subject: [PATCH 6.12.y 1/3] drm/displayid: pass iter to drm_find_displayid_extension() Date: Wed, 31 Dec 2025 11:29:24 -0500 Message-ID: <20251231162926.3267905-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025122954-stony-herring-2347@gregkh> References: <2025122954-stony-herring-2347@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jani Nikula [ Upstream commit 520f37c30992fd0c212a34fbe99c062b7a3dc52e ] It's more convenient to pass iter than a handful of its members to drm_find_displayid_extension(), especially as we're about to add another member. Rename the function find_next_displayid_extension() while at it, to be more descriptive. Cc: Tiago Martins Araújo Acked-by: Alex Deucher Tested-by: Tiago Martins Araújo Cc: stable@vger.kernel.org Link: https://patch.msgid.link/3837ae7f095e77a082ac2422ce2fac96c4f9373d.1761681968.git.jani.nikula@intel.com Signed-off-by: Jani Nikula Stable-dep-of: 83cbb4d33dc2 ("drm/displayid: add quirk to ignore DisplayID checksum errors") Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_displayid.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c index b4fd43783c50..20b453d2b854 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -48,26 +48,24 @@ validate_displayid(const u8 *displayid, int length, int idx) return base; } -static const u8 *drm_find_displayid_extension(const struct drm_edid *drm_edid, - int *length, int *idx, - int *ext_index) +static const u8 *find_next_displayid_extension(struct displayid_iter *iter) { const struct displayid_header *base; const u8 *displayid; - displayid = drm_edid_find_extension(drm_edid, DISPLAYID_EXT, ext_index); + displayid = drm_edid_find_extension(iter->drm_edid, DISPLAYID_EXT, &iter->ext_index); if (!displayid) return NULL; /* EDID extensions block checksum isn't for us */ - *length = EDID_LENGTH - 1; - *idx = 1; + iter->length = EDID_LENGTH - 1; + iter->idx = 1; - base = validate_displayid(displayid, *length, *idx); + base = validate_displayid(displayid, iter->length, iter->idx); if (IS_ERR(base)) return NULL; - *length = *idx + sizeof(*base) + base->bytes; + iter->length = iter->idx + sizeof(*base) + base->bytes; return displayid; } @@ -126,10 +124,7 @@ __displayid_iter_next(struct displayid_iter *iter) /* The first section we encounter is the base section */ bool base_section = !iter->section; - iter->section = drm_find_displayid_extension(iter->drm_edid, - &iter->length, - &iter->idx, - &iter->ext_index); + iter->section = find_next_displayid_extension(iter); if (!iter->section) { iter->drm_edid = NULL; return NULL; -- 2.51.0