Commit c5de2484 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/dpt: Add a modparam to disable DPT via the chicken bit 



Add i915.enable_dpt modparam to allow disabling the DPT
usage in hardware via the chicken bit. Useful when debugging
potential DPT issues.

Quickly smoke tested on ADL.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230320090522.9909-6-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
parent 5a08585d

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

+6 −0
Original line number Diff line number Diff line
@@ -6968,6 +6968,12 @@ static void intel_update_crtc(struct intel_atomic_state *state, 
		intel_atomic_get_new_crtc_state(state, crtc);

	bool modeset = intel_crtc_needs_modeset(new_crtc_state);



	if (old_crtc_state->inherited ||

	    intel_crtc_needs_modeset(new_crtc_state)) {

		if (HAS_DPT(i915))

			intel_dpt_configure(crtc);

	}



	if (!modeset) {

		if (new_crtc_state->preload_luts &&

		    intel_crtc_needs_color_update(new_crtc_state))

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

+21 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include "gt/gen8_ppgtt.h"



#include "i915_drv.h"

#include "i915_reg.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dpt.h"

#include "intel_fb.h"
@@ -313,3 +315,22 @@ void intel_dpt_destroy(struct i915_address_space *vm) 
	dpt->obj->is_dpt = false;

	i915_vm_put(&dpt->vm);

}



void intel_dpt_configure(struct intel_crtc *crtc)

{

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);



	if (DISPLAY_VER(i915) == 14) {

		enum pipe pipe = crtc->pipe;

		enum plane_id plane_id;



		for_each_plane_id_on_crtc(crtc, plane_id)

			intel_de_rmw(i915, PLANE_CHICKEN(pipe, plane_id),

				     PLANE_CHICKEN_DISABLE_DPT,

				     i915->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);

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ struct drm_i915_private; 


struct i915_address_space;

struct i915_vma;

struct intel_crtc;

struct intel_framebuffer;



void intel_dpt_destroy(struct i915_address_space *vm);
@@ -19,5 +20,6 @@ void intel_dpt_suspend(struct drm_i915_private *i915); 
void intel_dpt_resume(struct drm_i915_private *i915);

struct i915_address_space *

intel_dpt_create(struct intel_framebuffer *fb);

void intel_dpt_configure(struct intel_crtc *crtc);



#endif /* __INTEL_DPT_H__ */

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

+4 −3
Original line number Diff line number Diff line
@@ -716,14 +716,15 @@ static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) 
	}

}



static bool intel_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)

bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)

{

	return HAS_DPT(i915) && modifier != DRM_FORMAT_MOD_LINEAR;

}



bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)

{

	return fb && intel_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);

	return fb && to_i915(fb->dev)->params.enable_dpt &&

		intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);

}



unsigned int intel_cursor_alignment(const struct drm_i915_private *i915)
@@ -1705,7 +1706,7 @@ u32 intel_fb_max_stride(struct drm_i915_private *dev_priv, 
	 * The new CCS hash mode makes remapping impossible

	 */

	if (DISPLAY_VER(dev_priv) < 4 || intel_fb_is_ccs_modifier(modifier) ||

	    intel_modifier_uses_dpt(dev_priv, modifier))

	    intel_fb_modifier_uses_dpt(dev_priv, modifier))

		return intel_plane_fb_max_stride(dev_priv, pixel_format, modifier);

	else if (DISPLAY_VER(dev_priv) >= 7)

		return 256 * 1024;

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 
			      struct drm_file *filp,

			      const struct drm_mode_fb_cmd2 *user_mode_cmd);



bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier);

bool intel_fb_uses_dpt(const struct drm_framebuffer *fb);



#endif /* __INTEL_FB_H__ */