From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4A27E36D9EA; Wed, 20 May 2026 17:41:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779298910; cv=none; b=UrPpGQ56UK36FPsBLEA1betzkK36M1ZhH9wJjLQ2IIPXKtLJyzQt71Umlcd1tWYxAMopKIwFEPal2rR7oEHDKKTpEdee8JfWW1G7sIL8OSRrvF4YQJFzoK9dVVr5tL/3PlHVU6kSjDFEVylDOcsWWM2E7SbfUnMl9tst8O9kDgA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779298910; c=relaxed/simple; bh=qiFzu6eRzwSsOh4cQc9AJsS0XkOErEA0+Mbh0+F+3ZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gg4AeA8l7LKo4iV3isHNZULPQkbL9IP+gF4v4efWAFjLN1ry5KCzuxdEGCyAa23ZTVKRY4/EHIR3BPpYk8zFJtGngPyUzCLJZ4HL96/aEt+KO1yz7YGX9PkSMhaTXE/LK7HF23NGfulsh8eMTXsOzuxtV415fL2QaypKbe1RNGY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DS42pHQu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DS42pHQu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE2C21F000E9; Wed, 20 May 2026 17:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779298909; bh=VrR41/bRoWqE5KQi54+JJgxjBgRGrSe8MCeXFrIIkg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DS42pHQu7C4XdJMXWXP4DBIFe/8bHWzbxNlc+xmJRWD4zaUhIjUCoMfyE3uDoyDPj GHvZYrVx00QJ6M2lH7Uzw8CuUws5gzHI99FACf+HrjAG1FdJ1TtbiJ51Ry+TTIB4UE VF2g9VygO1JwcB0cNSw8lHrqkkXTEwe6cW9fT1rI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Vinod Govindapillai , Tvrtko Ursulin , Sasha Levin Subject: [PATCH 6.18 591/957] drm/i915/wm: Verify the correct plane DDB entry Date: Wed, 20 May 2026 18:17:54 +0200 Message-ID: <20260520162147.347473311@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä [ Upstream commit a97c88a176b6b8d116f4d3f508f3bd02bc77b462 ] Actually verify the DDB entry for the plane we're looking at instead of always verifying the cursor DDB. Fixes: 7d4561722c3b ("drm/i915: Tweak plane ddb allocation tracking") Signed-off-by: Ville Syrjälä Link: https://patch.msgid.link/20260324134843.2364-5-ville.syrjala@linux.intel.com Reviewed-by: Vinod Govindapillai (cherry picked from commit f002f7c7439de18117a31ca84dc87a59719c3dd6) Signed-off-by: Tvrtko Ursulin Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/display/skl_watermark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index d74cbb43ae6fb..a5862998bf144 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3935,8 +3935,8 @@ void intel_wm_state_verify(struct intel_atomic_state *state, } /* DDB */ - hw_ddb_entry = &hw->ddb[PLANE_CURSOR]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[PLANE_CURSOR]; + hw_ddb_entry = &hw->ddb[plane->id]; + sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[plane->id]; if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) { drm_err(display->drm, -- 2.53.0