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

Commit d6e3cca3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Extract gen8_gt_irq_reset 



Fallout from an intermediate patch revision that I deemed worth saving.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 78ad455f

drivers/gpu/drm/i915/i915_irq.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -3140,6 +3140,14 @@ static void valleyview_irq_preinstall(struct drm_device *dev) 
	POSTING_READ(VLV_IER);

	POSTING_READ(VLV_IER);

}

}





static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)

{

	GEN8_IRQ_RESET_NDX(GT, 0);

	GEN8_IRQ_RESET_NDX(GT, 1);

	GEN8_IRQ_RESET_NDX(GT, 2);

	GEN8_IRQ_RESET_NDX(GT, 3);

}



static void gen8_irq_reset(struct drm_device *dev)

static void gen8_irq_reset(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3148,10 +3156,7 @@ static void gen8_irq_reset(struct drm_device *dev) 
	I915_WRITE(GEN8_MASTER_IRQ, 0);

	I915_WRITE(GEN8_MASTER_IRQ, 0);

	POSTING_READ(GEN8_MASTER_IRQ);

	POSTING_READ(GEN8_MASTER_IRQ);





	GEN8_IRQ_RESET_NDX(GT, 0);

	gen8_gt_irq_reset(dev_priv);

	GEN8_IRQ_RESET_NDX(GT, 1);

	GEN8_IRQ_RESET_NDX(GT, 2);

	GEN8_IRQ_RESET_NDX(GT, 3);





	for_each_pipe(pipe)

	for_each_pipe(pipe)

		GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);

		GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
@@ -3171,10 +3176,7 @@ static void cherryview_irq_preinstall(struct drm_device *dev) 
	I915_WRITE(GEN8_MASTER_IRQ, 0);

	I915_WRITE(GEN8_MASTER_IRQ, 0);

	POSTING_READ(GEN8_MASTER_IRQ);

	POSTING_READ(GEN8_MASTER_IRQ);





	GEN8_IRQ_RESET_NDX(GT, 0);

	gen8_gt_irq_reset(dev_priv);

	GEN8_IRQ_RESET_NDX(GT, 1);

	GEN8_IRQ_RESET_NDX(GT, 2);

	GEN8_IRQ_RESET_NDX(GT, 3);





	GEN5_IRQ_RESET(GEN8_PCU_);

	GEN5_IRQ_RESET(GEN8_PCU_);