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

Commit 084b612e authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: SDVO hotplug have different interrupt status bits for i915/i965/g4x 



Note that gen3 is the only platform where we've got the bit
definitions right, hence the workaround of disabling sdvo hotplug
support on i945g/gm is not due to misdiagnosis of broken hotplug irq
handling ...

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: add some blurb about sdvo hotplug fail on i945g/gm I've
wondered about while reviewing.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 10f76a38

drivers/gpu/drm/i915/i915_irq.c

+13 −6
Original line number Diff line number Diff line
@@ -2158,9 +2158,9 @@ static int i915_irq_postinstall(struct drm_device *dev) 
			hotplug_en |= HDMIC_HOTPLUG_INT_EN;

		if (dev_priv->hotplug_supported_mask & HDMID_HOTPLUG_INT_STATUS)

			hotplug_en |= HDMID_HOTPLUG_INT_EN;

		if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS)

		if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS_I915)

			hotplug_en |= SDVOC_HOTPLUG_INT_EN;

		if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS)

		if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS_I915)

			hotplug_en |= SDVOB_HOTPLUG_INT_EN;

		if (dev_priv->hotplug_supported_mask & CRT_HOTPLUG_INT_STATUS) {

			hotplug_en |= CRT_HOTPLUG_INT_EN;
@@ -2383,10 +2383,17 @@ static int i965_irq_postinstall(struct drm_device *dev) 
		hotplug_en |= HDMIC_HOTPLUG_INT_EN;

	if (dev_priv->hotplug_supported_mask & HDMID_HOTPLUG_INT_STATUS)

		hotplug_en |= HDMID_HOTPLUG_INT_EN;

	if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS)

	if (IS_G4X(dev)) {

		if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS_G4X)

			hotplug_en |= SDVOC_HOTPLUG_INT_EN;

	if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS)

		if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS_G4X)

			hotplug_en |= SDVOB_HOTPLUG_INT_EN;

	} else {

		if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS_I965)

			hotplug_en |= SDVOC_HOTPLUG_INT_EN;

		if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS_I965)

			hotplug_en |= SDVOB_HOTPLUG_INT_EN;

	}

	if (dev_priv->hotplug_supported_mask & CRT_HOTPLUG_INT_STATUS) {

		hotplug_en |= CRT_HOTPLUG_INT_EN;

drivers/gpu/drm/i915/i915_reg.h

+8 −3
Original line number Diff line number Diff line
@@ -1572,15 +1572,20 @@ 
#define   HDMID_HOTPLUG_INT_STATUS		(3 << 21)

#define   HDMIC_HOTPLUG_INT_STATUS		(3 << 19)

#define   HDMIB_HOTPLUG_INT_STATUS		(3 << 17)

/* CRT/TV/SDVO common between gen3+ */

/* CRT/TV common between gen3+ */

#define   CRT_HOTPLUG_INT_STATUS		(1 << 11)

#define   TV_HOTPLUG_INT_STATUS			(1 << 10)

#define   CRT_HOTPLUG_MONITOR_MASK		(3 << 8)

#define   CRT_HOTPLUG_MONITOR_COLOR		(3 << 8)

#define   CRT_HOTPLUG_MONITOR_MONO		(2 << 8)

#define   CRT_HOTPLUG_MONITOR_NONE		(0 << 8)

#define   SDVOC_HOTPLUG_INT_STATUS		(1 << 7)

#define   SDVOB_HOTPLUG_INT_STATUS		(1 << 6)

/* SDVO is different across gen3/4 */

#define   SDVOC_HOTPLUG_INT_STATUS_G4X		(1 << 3)

#define   SDVOB_HOTPLUG_INT_STATUS_G4X		(1 << 2)

#define   SDVOC_HOTPLUG_INT_STATUS_I965		(3 << 4)

#define   SDVOB_HOTPLUG_INT_STATUS_I965		(3 << 2)

#define   SDVOC_HOTPLUG_INT_STATUS_I915		(1 << 7)

#define   SDVOB_HOTPLUG_INT_STATUS_I915		(1 << 6)



/* SDVO port control */

#define SDVOB			0x61140

drivers/gpu/drm/i915/intel_sdvo.c

+13 −4
Original line number Diff line number Diff line
@@ -2511,6 +2511,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_encoder *intel_encoder;

	struct intel_sdvo *intel_sdvo;

	u32 hotplug_mask;

	int i;



	intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL);
@@ -2542,10 +2543,18 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
		}

	}



	if (intel_sdvo->is_sdvob)

		dev_priv->hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;

	else

		dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;

	hotplug_mask = 0;

	if (IS_G4X(dev)) {

		hotplug_mask = intel_sdvo->is_sdvob ?

			SDVOB_HOTPLUG_INT_STATUS_G4X : SDVOC_HOTPLUG_INT_STATUS_G4X;

	} else if (IS_GEN4(dev)) {

		hotplug_mask = intel_sdvo->is_sdvob ?

			SDVOB_HOTPLUG_INT_STATUS_I965 : SDVOC_HOTPLUG_INT_STATUS_I965;

	} else {

		hotplug_mask = intel_sdvo->is_sdvob ?

			SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915;

	}

	dev_priv->hotplug_supported_mask |= hotplug_mask;



	drm_encoder_helper_add(&intel_encoder->base, &intel_sdvo_helper_funcs);