drm/i915/display: Move enable_dpt module parameter under display

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-11-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 60fa0bbce77d34ac343da74a6624f58e258d18ef..9067ffd6d2a9097bee2347eb54486d36c1e26649 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -47,6 +47,9 @@ intel_display_param_named_unsafe(enable_dc, int, 0400,
        "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; "
        "3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO)");
 
+intel_display_param_named_unsafe(enable_dpt, bool, 0400,
+       "Enable display page table (DPT) (default: true)");
+
 intel_display_param_named_unsafe(enable_fbc, int, 0400,
        "Enable frame buffer compression for power savings "
        "(default: -1 (use per-chip default))");

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index 2cca06ad7d71b1883fcfd71ee741015f5a8691a2..e5f139239f23010cd246e482b9193758c059e6c3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -29,6 +29,7 @@ struct drm_i915_private;
        param(int, panel_use_ssc, -1, 0600) \
        param(int, vbt_sdvo_panel_type, -1, 0400) \
        param(int, enable_dc, -1, 0400) \
+       param(bool, enable_dpt, true, 0400) \
        param(int, enable_fbc, -1, 0600) \
        param(int, enable_psr, -1, 0600) \
        param(bool, psr_safest_params, false, 0400) \

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index 48582b31b7f7f98382f5298be83eb3e232afe958..2b067cb952f001563fb0b19e4f75d4eb71b06547 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -332,11 +332,13 @@ void intel_dpt_configure(struct intel_crtc *crtc)
 
                        intel_de_rmw(i915, PLANE_CHICKEN(pipe, plane_id),
                                     PLANE_CHICKEN_DISABLE_DPT,
-                                    i915->params.enable_dpt ? 0 : PLANE_CHICKEN_DISABLE_DPT);
+                                    i915->display.params.enable_dpt ? 0 :
+                                    PLANE_CHICKEN_DISABLE_DPT);
                }
        } else if (DISPLAY_VER(i915) == 13) {
                intel_de_rmw(i915, CHICKEN_MISC_2,
                             CHICKEN_MISC_DISABLE_DPT,
-                            i915->params.enable_dpt ? 0 : CHICKEN_MISC_DISABLE_DPT);
+                            i915->display.params.enable_dpt ? 0 :
+                            CHICKEN_MISC_DISABLE_DPT);
        }
 }

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index e1d298efc510b5c72e1756eabb29a9ce12df9a6a..e1db7a3afd1ace7b26a9f1e5650d64c3c25f9ba9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -764,7 +764,7 @@ bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)
 
 bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)
 {
-       return fb && to_i915(fb->dev)->params.enable_dpt &&
+       return fb && to_i915(fb->dev)->display.params.enable_dpt &&
                intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);
 }
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 49e9d40d5e6770e74c6f11e4ae303aa1c9579ed0..68035675ae3ca6874371f13a0454e995391bc67e 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2488,7 +2488,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
                goto error;
        }
 
-       if (!dev_priv->params.enable_dpt &&
+       if (!dev_priv->display.params.enable_dpt &&
            intel_fb_modifier_uses_dpt(dev_priv, fb->modifier)) {
                drm_dbg_kms(&dev_priv->drm, "DPT disabled, skipping initial FB\n");
                goto error;

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 3d370e43df3cdf9a71bb09294486baa89d56b749..773a0a709fc6e0101f790a8f07eae0a689ed5aba 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -95,9 +95,6 @@ i915_param_named_unsafe(disable_power_well, int, 0400,
 
 i915_param_named_unsafe(enable_ips, int, 0400, "Enable IPS (default: true)");
 
-i915_param_named_unsafe(enable_dpt, bool, 0400,
-       "Enable display page table (DPT) (default: true)");
-
 i915_param_named_unsafe(load_detect_test, bool, 0400,
        "Force-enable the VGA load detect code for testing (default:false). "
        "For developers only.");

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index c3487b9d69378095d8d924c63e534cba1a84aba5..b8728990cb8bcf14bf79dd7e165ce622f50ebfa7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,6 @@ struct drm_printer;
  */
 #define I915_PARAMS_FOR_EACH(param) \
        param(int, modeset, -1, 0400) \
-       param(bool, enable_dpt, true, 0400) \
        param(bool, enable_sagv, true, 0600) \
        param(int, disable_power_well, -1, 0400) \
        param(int, enable_ips, 1, 0600) \