Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d27e20 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Replace a few for_each_pipe(i) by for_each_pipe(pipe) 



Consistency throughout the code base is good and remove some room for
mistakes (as explained in the "drm/i915: Use a pipe variable to cycle
through the pipes" commit)

So, let's replace the for_each_pipe(i) occurences by for_each_pipe(pipe)
when it's reasonable and practical to do so (eg. when there isn't another
pipe variable already).

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e3d51285

drivers/gpu/drm/i915/i915_debugfs.c

+7 −7
Original line number Diff line number Diff line
@@ -614,16 +614,16 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
				   i, I915_READ(GEN8_GT_IER(i)));

		}



		for_each_pipe(i) {

		for_each_pipe(pipe) {

			seq_printf(m, "Pipe %c IMR:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IMR(i)));

				   pipe_name(pipe),

				   I915_READ(GEN8_DE_PIPE_IMR(pipe)));

			seq_printf(m, "Pipe %c IIR:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IIR(i)));

				   pipe_name(pipe),

				   I915_READ(GEN8_DE_PIPE_IIR(pipe)));

			seq_printf(m, "Pipe %c IER:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IER(i)));

				   pipe_name(pipe),

				   I915_READ(GEN8_DE_PIPE_IER(pipe)));

		}



		seq_printf(m, "Display Engine port interrupt mask:\t%08x\n",

drivers/gpu/drm/i915/i915_irq.c

+7 −7
Original line number Diff line number Diff line
@@ -1867,7 +1867,7 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir) 
static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe i;

	enum pipe pipe;



	if (de_iir & DE_ERR_INT_IVB)

		ivb_err_int_handler(dev);
@@ -1878,14 +1878,14 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir) 
	if (de_iir & DE_GSE_IVB)

		intel_opregion_asle_intr(dev);



	for_each_pipe(i) {

		if (de_iir & (DE_PIPE_VBLANK_IVB(i)))

			drm_handle_vblank(dev, i);

	for_each_pipe(pipe) {

		if (de_iir & (DE_PIPE_VBLANK_IVB(pipe)))

			drm_handle_vblank(dev, pipe);



		/* plane/pipes map 1:1 on ilk+ */

		if (de_iir & DE_PLANE_FLIP_DONE_IVB(i)) {

			intel_prepare_page_flip(dev, i);

			intel_finish_page_flip_plane(dev, i);

		if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe)) {

			intel_prepare_page_flip(dev, pipe);

			intel_finish_page_flip_plane(dev, pipe);

		}

	}

drivers/gpu/drm/i915/intel_pm.c

+8 −8
Original line number Diff line number Diff line
@@ -4792,7 +4792,7 @@ static void lpt_suspend_hw(struct drm_device *dev) 
static void gen8_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe i;

	enum pipe pipe;



	I915_WRITE(WM3_LP_ILK, 0);

	I915_WRITE(WM2_LP_ILK, 0);
@@ -4837,9 +4837,9 @@ static void gen8_init_clock_gating(struct drm_device *dev) 
		   I915_READ(CHICKEN_PAR1_1) | DPA_MASK_VBLANK_SRD);



	/* WaPsrDPRSUnmaskVBlankInSRD:bdw */

	for_each_pipe(i) {

		I915_WRITE(CHICKEN_PIPESL_1(i),

			   I915_READ(CHICKEN_PIPESL_1(i) |

	for_each_pipe(pipe) {

		I915_WRITE(CHICKEN_PIPESL_1(pipe),

			   I915_READ(CHICKEN_PIPESL_1(pipe) |

				     DPRS_MASK_VBLANK_SRD));

	}
@@ -5310,7 +5310,7 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv) 
static void hsw_power_well_post_disable(struct drm_i915_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;

	enum pipe p;

	enum pipe pipe;

	unsigned long irqflags;



	/*
@@ -5321,9 +5321,9 @@ static void hsw_power_well_post_disable(struct drm_i915_private *dev_priv) 
	 * FIXME: Should we do this in general in drm_vblank_post_modeset?

	 */

	spin_lock_irqsave(&dev->vbl_lock, irqflags);

	for_each_pipe(p)

		if (p != PIPE_A)

			dev->vblank[p].last = 0;

	for_each_pipe(pipe)

		if (pipe != PIPE_A)

			dev->vblank[pipe].last = 0;

	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);

}