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

Commit 2d7b8366 authored by Yuanhan Liu's avatar Yuanhan Liu Committed by Chris Wilson
Browse files

drm/i915: Update hotplug interrupts register definitions for Sandybridge 

On Sandybridge, the bit definition for hotplug on SDE has changed, so
update the code to new definition.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30378


Cc: stable@kernel.org
Signed-off-by: default avatarYuanhan Liu <yuanhan.liu@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 1510a971

drivers/gpu/drm/i915/i915_irq.c

+16 −5
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static irqreturn_t ironlake_irq_handler(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int ret = IRQ_NONE;

	u32 de_iir, gt_iir, de_ier, pch_iir;

	u32 hotplug_mask;

	struct drm_i915_master_private *master_priv;

	struct intel_ring_buffer *render_ring = &dev_priv->render_ring;

	u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
@@ -317,6 +318,11 @@ static irqreturn_t ironlake_irq_handler(struct drm_device *dev) 
	if (de_iir == 0 && gt_iir == 0 && pch_iir == 0)

		goto done;



	if (HAS_PCH_CPT(dev))

		hotplug_mask = SDE_HOTPLUG_MASK_CPT;

	else

		hotplug_mask = SDE_HOTPLUG_MASK;



	ret = IRQ_HANDLED;



	if (dev->primary->master) {
@@ -358,10 +364,8 @@ static irqreturn_t ironlake_irq_handler(struct drm_device *dev) 
		drm_handle_vblank(dev, 1);



	/* check event from PCH */

	if ((de_iir & DE_PCH_EVENT) &&

	    (pch_iir & SDE_HOTPLUG_MASK)) {

	if ((de_iir & DE_PCH_EVENT) && (pch_iir & hotplug_mask))

		queue_work(dev_priv->wq, &dev_priv->hotplug_work);

	}



	if (de_iir & DE_PCU_EVENT) {

		I915_WRITE16(MEMINTRSTS, I915_READ(MEMINTRSTS));
@@ -1431,8 +1435,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) 
	u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |

			   DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE;

	u32 render_mask = GT_PIPE_NOTIFY | GT_BSD_USER_INTERRUPT;

	u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |

			   SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;

	u32 hotplug_mask;



	dev_priv->irq_mask_reg = ~display_mask;

	dev_priv->de_irq_enable_reg = display_mask | DE_PIPEA_VBLANK | DE_PIPEB_VBLANK;
@@ -1459,6 +1462,14 @@ static int ironlake_irq_postinstall(struct drm_device *dev) 
	I915_WRITE(GTIER, dev_priv->gt_irq_enable_reg);

	(void) I915_READ(GTIER);



	if (HAS_PCH_CPT(dev)) {

		hotplug_mask = SDE_CRT_HOTPLUG_CPT | SDE_PORTB_HOTPLUG_CPT  |

			       SDE_PORTC_HOTPLUG_CPT | SDE_PORTD_HOTPLUG_CPT ;

	} else {

		hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |

			       SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;

	}



	dev_priv->pch_irq_mask_reg = ~hotplug_mask;

	dev_priv->pch_irq_enable_reg = hotplug_mask;

drivers/gpu/drm/i915/i915_reg.h

+4 −0
Original line number Diff line number Diff line
@@ -2601,6 +2601,10 @@ 
#define SDE_PORTD_HOTPLUG_CPT	(1 << 23)

#define SDE_PORTC_HOTPLUG_CPT	(1 << 22)

#define SDE_PORTB_HOTPLUG_CPT	(1 << 21)

#define SDE_HOTPLUG_MASK_CPT	(SDE_CRT_HOTPLUG_CPT |		\

				 SDE_PORTD_HOTPLUG_CPT |	\

				 SDE_PORTC_HOTPLUG_CPT |	\

				 SDE_PORTB_HOTPLUG_CPT)



#define SDEISR  0xc4000

#define SDEIMR  0xc4004