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.

Signed-off-by: Gustavo Sousa <gustavo.so...@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 f6ec79b0e39d..55f07f3c9863 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"
@@ -250,20 +252,25 @@ static bool intel_dmc_wl_check_range(struct intel_display 
*display, u32 address)
 
 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

Reply via email to