Commit 307fa415 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: convert intel_display_trace.h to struct intel_display 



Going forward, struct intel_display shall replace struct
drm_i915_private as the main display device data pointer type. Convert
intel_display_trace.h to struct intel_display.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904130633.3831492-2-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 138d2bda

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

+2 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static void chv_set_memory_pm5(struct drm_i915_private *dev_priv, bool enable) 


static bool _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)

{

	struct intel_display *display = &dev_priv->display;

	bool was_enabled;

	u32 val;
@@ -186,7 +187,7 @@ static bool _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enabl 
		return false;

	}



	trace_intel_memory_cxsr(dev_priv, was_enabled, enable);

	trace_intel_memory_cxsr(display, was_enabled, enable);



	drm_dbg_kms(&dev_priv->drm, "memory self-refresh is %s (was %s)\n",

		    str_enabled_disabled(enable),

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

+21 −23
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "intel_display_types.h"

#include "intel_vblank.h"



#define __dev_name_i915(i915) dev_name((i915)->drm.dev)

#define __dev_name_display(display) dev_name((display)->drm->dev)

#define __dev_name_kms(obj) dev_name((obj)->base.dev->dev)



TRACE_EVENT(intel_pipe_enable,
@@ -32,10 +32,10 @@ TRACE_EVENT(intel_pipe_enable, 
			     __field(enum pipe, pipe)

			     ),

	    TP_fast_assign(

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

			   struct intel_display *display = to_intel_display(crtc);

			   struct intel_crtc *it__;

			   __assign_str(dev);

			   for_each_intel_crtc(&dev_priv->drm, it__) {

			   for_each_intel_crtc(display->drm, it__) {

				   __entry->frame[it__->pipe] = intel_crtc_get_vblank_counter(it__);

				   __entry->scanline[it__->pipe] = intel_get_crtc_scanline(it__);

			   }
@@ -61,10 +61,10 @@ TRACE_EVENT(intel_pipe_disable, 
			     ),



	    TP_fast_assign(

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

			   struct intel_display *display = to_intel_display(crtc);

			   struct intel_crtc *it__;

			   __assign_str(dev);

			   for_each_intel_crtc(&dev_priv->drm, it__) {

			   for_each_intel_crtc(display->drm, it__) {

				   __entry->frame[it__->pipe] = intel_crtc_get_vblank_counter(it__);

				   __entry->scanline[it__->pipe] = intel_get_crtc_scanline(it__);

			   }
@@ -130,18 +130,17 @@ TRACE_EVENT(intel_pipe_crc, 
);



TRACE_EVENT(intel_cpu_fifo_underrun,

	    TP_PROTO(struct drm_i915_private *dev_priv, enum pipe pipe),

	    TP_ARGS(dev_priv, pipe),

	    TP_PROTO(struct intel_display *display, enum pipe pipe),

	    TP_ARGS(display, pipe),



	    TP_STRUCT__entry(

			     __string(dev, __dev_name_i915(dev_priv))

			     __string(dev, __dev_name_display(display))

			     __field(enum pipe, pipe)

			     __field(u32, frame)

			     __field(u32, scanline)

			     ),



	    TP_fast_assign(

			   struct intel_display *display = &dev_priv->display;

			   struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);

			   __assign_str(dev);

			   __entry->pipe = pipe;
@@ -155,18 +154,17 @@ TRACE_EVENT(intel_cpu_fifo_underrun, 
);



TRACE_EVENT(intel_pch_fifo_underrun,

	    TP_PROTO(struct drm_i915_private *dev_priv, enum pipe pch_transcoder),

	    TP_ARGS(dev_priv, pch_transcoder),

	    TP_PROTO(struct intel_display *display, enum pipe pch_transcoder),

	    TP_ARGS(display, pch_transcoder),



	    TP_STRUCT__entry(

			     __string(dev, __dev_name_i915(dev_priv))

			     __string(dev, __dev_name_display(display))

			     __field(enum pipe, pipe)

			     __field(u32, frame)

			     __field(u32, scanline)

			     ),



	    TP_fast_assign(

			   struct intel_display *display = &dev_priv->display;

			   enum pipe pipe = pch_transcoder;

			   struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);

			   __assign_str(dev);
@@ -181,11 +179,11 @@ TRACE_EVENT(intel_pch_fifo_underrun, 
);



TRACE_EVENT(intel_memory_cxsr,

	    TP_PROTO(struct drm_i915_private *dev_priv, bool old, bool new),

	    TP_ARGS(dev_priv, old, new),

	    TP_PROTO(struct intel_display *display, bool old, bool new),

	    TP_ARGS(display, old, new),



	    TP_STRUCT__entry(

			     __string(dev, __dev_name_i915(dev_priv))

			     __string(dev, __dev_name_display(display))

			     __array(u32, frame, 3)

			     __array(u32, scanline, 3)

			     __field(bool, old)
@@ -195,7 +193,7 @@ TRACE_EVENT(intel_memory_cxsr, 
	    TP_fast_assign(

			   struct intel_crtc *crtc;

			   __assign_str(dev);

			   for_each_intel_crtc(&dev_priv->drm, crtc) {

			   for_each_intel_crtc(display->drm, crtc) {

				   __entry->frame[crtc->pipe] = intel_crtc_get_vblank_counter(crtc);

				   __entry->scanline[crtc->pipe] = intel_get_crtc_scanline(crtc);

			   }
@@ -657,12 +655,12 @@ TRACE_EVENT(intel_pipe_update_end, 
);



TRACE_EVENT(intel_frontbuffer_invalidate,

	    TP_PROTO(struct drm_i915_private *i915,

	    TP_PROTO(struct intel_display *display,

		     unsigned int frontbuffer_bits, unsigned int origin),

	    TP_ARGS(i915, frontbuffer_bits, origin),

	    TP_ARGS(display, frontbuffer_bits, origin),



	    TP_STRUCT__entry(

			     __string(dev, __dev_name_i915(i915))

			     __string(dev, __dev_name_display(display))

			     __field(unsigned int, frontbuffer_bits)

			     __field(unsigned int, origin)

			     ),
@@ -678,12 +676,12 @@ TRACE_EVENT(intel_frontbuffer_invalidate, 
);



TRACE_EVENT(intel_frontbuffer_flush,

	    TP_PROTO(struct drm_i915_private *i915,

	    TP_PROTO(struct intel_display *display,

		     unsigned int frontbuffer_bits, unsigned int origin),

	    TP_ARGS(i915, frontbuffer_bits, origin),

	    TP_ARGS(display, frontbuffer_bits, origin),



	    TP_STRUCT__entry(

			     __string(dev, __dev_name_i915(i915))

			     __string(dev, __dev_name_display(display))

			     __field(unsigned int, frontbuffer_bits)

			     __field(unsigned int, origin)

			     ),

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

+10 −5
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static bool cpt_can_enable_serr_int(struct drm_device *dev) 


static void i9xx_check_fifo_underruns(struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(crtc);

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

	i915_reg_t reg = PIPESTAT(dev_priv, crtc->pipe);

	u32 enable_mask;
@@ -108,7 +109,7 @@ static void i9xx_check_fifo_underruns(struct intel_crtc *crtc) 
	intel_de_write(dev_priv, reg, enable_mask | PIPE_FIFO_UNDERRUN_STATUS);

	intel_de_posting_read(dev_priv, reg);



	trace_intel_cpu_fifo_underrun(dev_priv, crtc->pipe);

	trace_intel_cpu_fifo_underrun(display, crtc->pipe);

	drm_err(&dev_priv->drm, "pipe %c underrun\n", pipe_name(crtc->pipe));

}
@@ -149,6 +150,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev, 


static void ivb_check_fifo_underruns(struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(crtc);

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

	enum pipe pipe = crtc->pipe;

	u32 err_int = intel_de_read(dev_priv, GEN7_ERR_INT);
@@ -161,7 +163,7 @@ static void ivb_check_fifo_underruns(struct intel_crtc *crtc) 
	intel_de_write(dev_priv, GEN7_ERR_INT, ERR_INT_FIFO_UNDERRUN(pipe));

	intel_de_posting_read(dev_priv, GEN7_ERR_INT);



	trace_intel_cpu_fifo_underrun(dev_priv, pipe);

	trace_intel_cpu_fifo_underrun(display, pipe);

	drm_err(&dev_priv->drm, "fifo underrun on pipe %c\n", pipe_name(pipe));

}
@@ -237,6 +239,7 @@ static void ibx_set_fifo_underrun_reporting(struct drm_device *dev, 


static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(crtc);

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

	enum pipe pch_transcoder = crtc->pipe;

	u32 serr_int = intel_de_read(dev_priv, SERR_INT);
@@ -250,7 +253,7 @@ static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc) 
		       SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder));

	intel_de_posting_read(dev_priv, SERR_INT);



	trace_intel_pch_fifo_underrun(dev_priv, pch_transcoder);

	trace_intel_pch_fifo_underrun(display, pch_transcoder);

	drm_err(&dev_priv->drm, "pch fifo underrun on pch transcoder %c\n",

		pipe_name(pch_transcoder));

}
@@ -432,7 +435,7 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, 
	}



	if (intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false)) {

		trace_intel_cpu_fifo_underrun(dev_priv, pipe);

		trace_intel_cpu_fifo_underrun(display, pipe);



		if (DISPLAY_VER(dev_priv) >= 11)

			drm_err(&dev_priv->drm, "CPU pipe %c FIFO underrun: %s%s%s%s\n",
@@ -460,9 +463,11 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, 
void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,

					 enum pipe pch_transcoder)

{

	struct intel_display *display = &dev_priv->display;



	if (intel_set_pch_fifo_underrun_reporting(dev_priv, pch_transcoder,

						  false)) {

		trace_intel_pch_fifo_underrun(dev_priv, pch_transcoder);

		trace_intel_pch_fifo_underrun(display, pch_transcoder);

		drm_err(&dev_priv->drm, "PCH transcoder %c FIFO underrun\n",

			pipe_name(pch_transcoder));

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void frontbuffer_flush(struct drm_i915_private *i915, 
	if (!frontbuffer_bits)

		return;



	trace_intel_frontbuffer_flush(i915, frontbuffer_bits, origin);

	trace_intel_frontbuffer_flush(display, frontbuffer_bits, origin);



	might_sleep();

	intel_td_flush(i915);
@@ -184,7 +184,7 @@ void __intel_fb_invalidate(struct intel_frontbuffer *front, 
		spin_unlock(&i915->display.fb_tracking.lock);

	}



	trace_intel_frontbuffer_invalidate(i915, frontbuffer_bits, origin);

	trace_intel_frontbuffer_invalidate(display, frontbuffer_bits, origin);



	might_sleep();

	intel_psr_invalidate(display, frontbuffer_bits, origin);