Commit 00535527 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/crc: move pipe_crc from drm_i915_private to intel_crtc 



Having an array pipe_crc[I915_MAX_PIPES] in struct drm_i915_private
should be an obvious clue this should be located in struct intel_crtc
instead. Make it so.

As a side-effect, fix some errors in indexing pipe_crc with both pipe
and crtc index. And, of course, reduce the size of i915_drv.h.

Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227161253.15741-1-jani.nikula@intel.com
parent 9a40bddd

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

+2 −0
Original line number Diff line number Diff line
@@ -16707,6 +16707,8 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 














	intel_color_init(crtc);



























	intel_crtc_crc_init(crtc);



























	drm_WARN_ON(&dev_priv->drm, drm_crtc_index(&crtc->base) != crtc->pipe);





























	return 0;

































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



+30
−0






























Original line number
Diff line number
Diff line








@@ -1045,6 +1045,32 @@ struct intel_crtc_state {













	enum transcoder mst_master_transcoder;















};





























enum intel_pipe_crc_source {













	INTEL_PIPE_CRC_SOURCE_NONE,













	INTEL_PIPE_CRC_SOURCE_PLANE1,













	INTEL_PIPE_CRC_SOURCE_PLANE2,













	INTEL_PIPE_CRC_SOURCE_PLANE3,













	INTEL_PIPE_CRC_SOURCE_PLANE4,













	INTEL_PIPE_CRC_SOURCE_PLANE5,













	INTEL_PIPE_CRC_SOURCE_PLANE6,













	INTEL_PIPE_CRC_SOURCE_PLANE7,













	INTEL_PIPE_CRC_SOURCE_PIPE,













	/* TV/DP on pre-gen5/vlv can't use the pipe source. */













	INTEL_PIPE_CRC_SOURCE_TV,













	INTEL_PIPE_CRC_SOURCE_DP_B,













	INTEL_PIPE_CRC_SOURCE_DP_C,













	INTEL_PIPE_CRC_SOURCE_DP_D,













	INTEL_PIPE_CRC_SOURCE_AUTO,













	INTEL_PIPE_CRC_SOURCE_MAX,













};



























#define INTEL_PIPE_CRC_ENTRIES_NR	128













struct intel_pipe_crc {













	spinlock_t lock;













	int skipped;













	enum intel_pipe_crc_source source;













};





























struct intel_crtc {















	struct drm_crtc base;















	enum pipe pipe;










@@ -1088,6 +1114,10 @@ struct intel_crtc {





























	/* per pipe DSB related info */















	struct intel_dsb dsb;



























#ifdef CONFIG_DEBUG_FS













	struct intel_pipe_crc pipe_crc;













#endif















};































struct intel_plane {

































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



+7
−10






























Original line number
Diff line number
Diff line








@@ -441,16 +441,12 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)













	return 0;















}





























void intel_display_crc_init(struct drm_i915_private *dev_priv)













void intel_crtc_crc_init(struct intel_crtc *crtc)















{













	enum pipe pipe;



























	for_each_pipe(dev_priv, pipe) {













		struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];













	struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;































	spin_lock_init(&pipe_crc->lock);















}













}































static int i8xx_crc_source_valid(struct drm_i915_private *dev_priv,















				 const enum intel_pipe_crc_source source)










@@ -587,7 +583,8 @@ int intel_crtc_verify_crc_source(struct drm_crtc *crtc, const char *source_name,













int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name)















{















	struct drm_i915_private *dev_priv = to_i915(crtc->dev);













	struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index];













	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);













	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;















	enum intel_display_power_domain power_domain;















	enum intel_pipe_crc_source source;















	intel_wakeref_t wakeref;










@@ -640,7 +637,7 @@ void intel_crtc_enable_pipe_crc(struct intel_crtc *intel_crtc)













{















	struct drm_crtc *crtc = &intel_crtc->base;















	struct drm_i915_private *dev_priv = to_i915(crtc->dev);













	struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index];













	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;















	u32 val = 0;































	if (!crtc->crc.opened)









@@ -660,7 +657,7 @@ void intel_crtc_disable_pipe_crc(struct intel_crtc *intel_crtc)













{















	struct drm_crtc *crtc = &intel_crtc->base;















	struct drm_i915_private *dev_priv = to_i915(crtc->dev);













	struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index];













	struct intel_pipe_crc *pipe_crc = &intel_crtc->pipe_crc;































	/* Swallow crc's until we stop generating them. */















	spin_lock_irq(&pipe_crc->lock);

































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



+2
−2






























Original line number
Diff line number
Diff line








@@ -13,7 +13,7 @@ struct drm_i915_private;













struct intel_crtc;































#ifdef CONFIG_DEBUG_FS













void intel_display_crc_init(struct drm_i915_private *dev_priv);













void intel_crtc_crc_init(struct intel_crtc *crtc);















int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name);















int intel_crtc_verify_crc_source(struct drm_crtc *crtc,















				 const char *source_name, size_t *values_cnt);









@@ -22,7 +22,7 @@ const char *const *intel_crtc_get_crc_sources(struct drm_crtc *crtc,













void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc);















void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc);















#else













static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {}













static inline void intel_crtc_crc_init(struct intel_crtc *crtc) {}















#define intel_crtc_set_crc_source NULL















#define intel_crtc_verify_crc_source NULL















#define intel_crtc_get_crc_sources NULL

































drivers/gpu/drm/i915/i915_drv.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -466,7 +466,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)













	intel_init_display_hooks(dev_priv);















	intel_init_clock_gating_hooks(dev_priv);















	intel_init_audio_hooks(dev_priv);













	intel_display_crc_init(dev_priv);































	intel_detect_preproduction_hw(dev_priv);

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE