Commit 04da42b4 authored by Jouni Högander's avatar Jouni Högander
Browse files

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



Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-11-jouni.hogander@intel.com
parent 0deee706

drivers/gpu/drm/i915/display/intel_display_params.c

+3 −0
Original line number Diff line number Diff line
@@ -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))");

drivers/gpu/drm/i915/display/intel_display_params.h

+1 −0
Original line number Diff line number Diff line
@@ -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) \

drivers/gpu/drm/i915/display/intel_dpt.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/gpu/drm/i915/display/intel_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/display/skl_universal_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -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;