Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Gustavo Sousa <gustavo.sousa@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Luca Coelho <luciano.coelho@intel.com>,
	Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH v3 16/18] drm/i915/dmc_wl: Sanitize enable_dmc_wl according to hardware support
Date: Thu,  7 Nov 2024 15:27:21 -0300	[thread overview]
Message-ID: <20241107182921.102193-17-gustavo.sousa@intel.com> (raw)
In-Reply-To: <20241107182921.102193-1-gustavo.sousa@intel.com>

Instead of checking for HAS_DMC_WAKELOCK() multiple times, let's use it
to sanitize the enable_dmc_wl parameter and use that variable when
necessary.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dmc_wl.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dmc_wl.c b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
index 4ca2b990ec6a..c164ac6e1ada 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc_wl.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
@@ -5,6 +5,8 @@
 
 #include <linux/kernel.h>
 
+#include <drm/drm_print.h>
+
 #include "i915_reg.h"
 #include "intel_de.h"
 #include "intel_dmc.h"
@@ -262,20 +264,25 @@ static bool intel_dmc_wl_check_range(i915_reg_t reg, u32 dc_state)
 
 static bool __intel_dmc_wl_supported(struct intel_display *display)
 {
-	if (!HAS_DMC_WAKELOCK(display) ||
-	    !intel_dmc_has_payload(display) ||
-	    !display->params.enable_dmc_wl)
-		return false;
+	return display->params.enable_dmc_wl && intel_dmc_has_payload(display);
+}
 
-	return true;
+static void intel_dmc_wl_sanitize_param(struct intel_display *display)
+{
+	if (!HAS_DMC_WAKELOCK(display))
+		display->params.enable_dmc_wl = false;
+
+	drm_dbg_kms(display->drm, "Sanitized enable_dmc_wl value: %d\n",
+		    display->params.enable_dmc_wl);
 }
 
 void intel_dmc_wl_init(struct intel_display *display)
 {
 	struct intel_dmc_wl *wl = &display->wl;
 
-	/* don't call __intel_dmc_wl_supported(), DMC is not loaded yet */
-	if (!HAS_DMC_WAKELOCK(display) || !display->params.enable_dmc_wl)
+	intel_dmc_wl_sanitize_param(display);
+
+	if (!display->params.enable_dmc_wl)
 		return;
 
 	INIT_DELAYED_WORK(&wl->work, intel_dmc_wl_work);
-- 
2.47.0


  parent reply	other threads:[~2024-11-07 18:30 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-07 18:27 [PATCH v3 00/18] drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 01/18] drm/i915/dmc_wl: Use i915_mmio_reg_offset() instead of reg.reg Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 02/18] drm/xe: Mimic i915 behavior for non-sleeping MMIO wait Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 03/18] drm/i915/dmc_wl: Use non-sleeping variant of " Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 04/18] drm/i915/dmc_wl: Check for non-zero refcount in release work Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 05/18] drm/i915/dmc_wl: Get wakelock when disabling dynamic DC states Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 06/18] drm/i915/dmc_wl: Use sentinel item for range tables Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 07/18] drm/i915/dmc_wl: Extract intel_dmc_wl_reg_in_range() Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 08/18] drm/i915/dmc_wl: Rename lnl_wl_range to powered_off_ranges Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 09/18] drm/i915/dmc_wl: Track registers touched by the DMC Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 10/18] drm/i915/dmc_wl: Allow simpler syntax for single reg in range tables Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 11/18] drm/i915/dmc_wl: Deal with existing references when disabling Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 12/18] drm/i915/dmc_wl: Couple enable/disable with dynamic DC states Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 13/18] drm/i915/dmc_wl: Add and use HAS_DMC_WAKELOCK() Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 14/18] drm/i915/dmc_wl: Init only after we have runtime device info Gustavo Sousa
2024-11-07 18:27 ` [PATCH v3 15/18] drm/i915/dmc_wl: Use HAS_DMC() in HAS_DMC_WAKELOCK() Gustavo Sousa
2024-11-07 18:27 ` Gustavo Sousa [this message]
2024-11-07 18:27 ` [PATCH v3 17/18] drm/i915/dmc_wl: Do nothing until initialized Gustavo Sousa
2024-11-07 19:23   ` Luca Coelho
2024-11-07 20:14     ` Gustavo Sousa
2024-11-07 20:22       ` Gustavo Sousa
2024-11-08  9:57         ` Luca Coelho
2024-11-08 13:10           ` Gustavo Sousa
2024-11-07 20:47       ` Gustavo Sousa
2024-11-08 10:00         ` Luca Coelho
2024-11-07 18:27 ` [PATCH v3 18/18] drm/i915/xe3lpd: Use DMC wakelock by default Gustavo Sousa
2024-11-07 19:04 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD (rev3) Patchwork
2024-11-07 19:04 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-11-07 19:29 ` ✓ Fi.CI.BAT: success " Patchwork
2024-11-07 21:32 ` ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241107182921.102193-17-gustavo.sousa@intel.com \
    --to=gustavo.sousa@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=luciano.coelho@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox