[PATCH] drm/i915: wire up SDVO hpd support on cpt/ppt

[PATCH] drm/i915: wire up SDVO hpd support on cpt/ppt

[Daniel Vetter]

Now with Egbert Eich's hpd infrastructure rework merged this is dead
simple. And we need this to make output detection work on SDVO - with
the cleaned-up drm polling helpers outputs which claim to have hpd
support are no longer polled.

Now SDVO claims to do that, but it's not actually wired up. So just do
it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_irq.c |    1 +
 drivers/gpu/drm/i915/i915_reg.h |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 43436e0..7cc18e2 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -46,6 +46,7 @@ static const u32 hpd_ibx[] = {
 
 static const u32 hpd_cpt[] = {
 	[HPD_CRT] = SDE_CRT_HOTPLUG_CPT,
+	[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG_CPT,
 	[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
 	[HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,
 	[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 9703307..5e91fbb 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3589,7 +3589,9 @@
 #define SDE_PORTC_HOTPLUG_CPT	(1 << 22)
 #define SDE_PORTB_HOTPLUG_CPT	(1 << 21)
 #define SDE_CRT_HOTPLUG_CPT	(1 << 19)
+#define SDE_SDVOB_HOTPLUG_CPT	(1 << 18)
 #define SDE_HOTPLUG_MASK_CPT	(SDE_CRT_HOTPLUG_CPT |		\
+				 SDE_SDVOB_HOTPLUG_CPT |	\
 				 SDE_PORTD_HOTPLUG_CPT |	\
 				 SDE_PORTC_HOTPLUG_CPT |	\
 				 SDE_PORTB_HOTPLUG_CPT)
-- 
1.7.10.4

Re: [PATCH] drm/i915: wire up SDVO hpd support on cpt/ppt

[Rodrigo Vivi]

[-- Attachment #1.1: Type: text/plain, Size: 2233 bytes --]

For a moment I confused CPT with LPT at bspec where 18 was reserved... but
now I found the correct one.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>




On Tue, Mar 26, 2013 at 6:38 PM, Daniel Vetter <daniel.vetter@ffwll.ch>wrote:

> Now with Egbert Eich's hpd infrastructure rework merged this is dead
> simple. And we need this to make output detection work on SDVO - with
> the cleaned-up drm polling helpers outputs which claim to have hpd
> support are no longer polled.
>
> Now SDVO claims to do that, but it's not actually wired up. So just do
> it.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_irq.c |    1 +
>  drivers/gpu/drm/i915/i915_reg.h |    2 ++
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c
> b/drivers/gpu/drm/i915/i915_irq.c
> index 43436e0..7cc18e2 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -46,6 +46,7 @@ static const u32 hpd_ibx[] = {
>
>  static const u32 hpd_cpt[] = {
>         [HPD_CRT] = SDE_CRT_HOTPLUG_CPT,
> +       [HPD_SDVO_B] = SDE_SDVOB_HOTPLUG_CPT,
>         [HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
>         [HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,
>         [HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
> diff --git a/drivers/gpu/drm/i915/i915_reg.h
> b/drivers/gpu/drm/i915/i915_reg.h
> index 9703307..5e91fbb 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -3589,7 +3589,9 @@
>  #define SDE_PORTC_HOTPLUG_CPT  (1 << 22)
>  #define SDE_PORTB_HOTPLUG_CPT  (1 << 21)
>  #define SDE_CRT_HOTPLUG_CPT    (1 << 19)
> +#define SDE_SDVOB_HOTPLUG_CPT  (1 << 18)
>  #define SDE_HOTPLUG_MASK_CPT   (SDE_CRT_HOTPLUG_CPT |          \
> +                                SDE_SDVOB_HOTPLUG_CPT |        \
>                                  SDE_PORTD_HOTPLUG_CPT |        \
>                                  SDE_PORTC_HOTPLUG_CPT |        \
>                                  SDE_PORTB_HOTPLUG_CPT)
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

[-- Attachment #1.2: Type: text/html, Size: 3902 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: wire up SDVO hpd support on cpt/ppt

[Daniel Vetter]

On Wed, Mar 27, 2013 at 03:46:15PM -0300, Rodrigo Vivi wrote:
> For a moment I confused CPT with LPT at bspec where 18 was reserved... but
> now I found the correct one.
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Queued for -next, thanks for the review.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch