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 5A60CF54AB0 for ; Tue, 24 Mar 2026 13:49:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D20910E6DF; Tue, 24 Mar 2026 13:49:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="V/cj0vWi"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5EF3D10E6DF; Tue, 24 Mar 2026 13:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774360154; x=1805896154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KoV1lbuDZOMy3ugECwBTg/ApRlIgnZMwamdskZUCkbM=; b=V/cj0vWi2Ja0PfHMCrmhwAsQaA8xeRmYYciMcla0oA0betDQywSJGQWU KASwFewt0tDlN2ooN2G7oWD4qa7n3SKTob3NoRoKurUR/nvrkVIEFN0ei t5O8jqZ9TRqGTPodA4wHBDxgZfLA9Bz36+EY69JPAIX76T44bPLc2Iqoi EGWaFavtEvkDd4i3zYFdPLEH8FF+MntDkVpJX6wbzd2QONyrJ0ACtG4ao u2wAdvtxdUiqcPLlsERGYXFv1M/0w0P99w0sX+Yadzo6CYN9xupz7sFvc 0rgEb8mulTgnVwLwl6GtN7RLAvyR4pgIjpYBbqyxd+r7/6QvG0kvsDh40 g==; X-CSE-ConnectionGUID: PrsKpaG4SDC/AERoVBCaIg== X-CSE-MsgGUID: GISVRp4XQ7KGp4QQgSRcaw== X-IronPort-AV: E=McAfee;i="6800,10657,11739"; a="100818959" X-IronPort-AV: E=Sophos;i="6.23,138,1770624000"; d="scan'208";a="100818959" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2026 06:49:14 -0700 X-CSE-ConnectionGUID: HdUnk7OFSvuF5D07+GcVVw== X-CSE-MsgGUID: K/a7GdAiSDm7ZsLDB8RaKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,138,1770624000"; d="scan'208";a="229105180" Received: from klitkey1-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.220]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2026 06:49:13 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: [PATCH 6/9] drm/i915/wm: Extract skl_ddb_entry_verify() Date: Tue, 24 Mar 2026 15:48:40 +0200 Message-ID: <20260324134843.2364-7-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260324134843.2364-1-ville.syrjala@linux.intel.com> References: <20260324134843.2364-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Ville Syrjälä Extract the DDB entry verification to a helper function. We'll have another caller soon. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/skl_watermark.c | 32 ++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 3e323e434bfb..17faf090a154 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3934,6 +3934,23 @@ static void skl_wm_level_verify(struct intel_plane *plane, hw_wm_level->enable, hw_wm_level->blocks, hw_wm_level->lines); } +static void skl_ddb_entry_verify(struct intel_plane *plane, + const char *ddb_name, + const struct skl_ddb_entry *hw_ddb_entry, + const struct skl_ddb_entry *sw_ddb_entry) +{ + struct intel_display *display = to_intel_display(plane); + + if (skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) + return; + + drm_err(display->drm, + "[PLANE:%d:%s] mismatch in %s (expected (%u,%u), found (%u,%u))\n", + plane->base.base.id, plane->base.name, ddb_name, + sw_ddb_entry->start, sw_ddb_entry->end, + hw_ddb_entry->start, hw_ddb_entry->end); +} + void intel_wm_state_verify(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@ -3977,7 +3994,6 @@ void intel_wm_state_verify(struct intel_atomic_state *state, &hw->wm.planes[plane->id]; const struct skl_plane_wm *sw_plane_wm = &sw_wm->planes[plane->id]; - const struct skl_ddb_entry *hw_ddb_entry, *sw_ddb_entry; for (level = 0; level < display->wm.num_levels; level++) { char wm_name[16]; @@ -4003,17 +4019,9 @@ void intel_wm_state_verify(struct intel_atomic_state *state, &sw_plane_wm->sagv.trans_wm); } - /* DDB */ - 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, - "[PLANE:%d:%s] mismatch in DDB (expected (%u,%u), found (%u,%u))\n", - plane->base.base.id, plane->base.name, - sw_ddb_entry->start, sw_ddb_entry->end, - hw_ddb_entry->start, hw_ddb_entry->end); - } + skl_ddb_entry_verify(plane, "DDB", + &hw->ddb[plane->id], + &new_crtc_state->wm.skl.plane_ddb[plane->id]); } kfree(hw); -- 2.52.0