2015-08-12 12:44 GMT-03:00 <ville.syrjala@xxxxxxxxxxxxxxx>:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> The PORTA HPD defines are not BXT specific. They also exist on SPT,
> and partially already on LPT:LP.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/i915_reg.h | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 8a1e35e..d12106c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1248,7 +1248,7 @@ static bool bxt_port_hotplug_long_detect(enum port port, u32 val)
> {
> switch (port) {
> case PORT_A:
> - return val & BXT_PORTA_HOTPLUG_LONG_DETECT;
> + return val & PORTA_HOTPLUG_LONG_DETECT;
> case PORT_B:
> return val & PORTB_HOTPLUG_LONG_DETECT;
> case PORT_C:
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index ed2d150..0e9990b 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6002,11 +6002,11 @@ enum skl_disp_power_wells {
>
> /* digital port hotplug */
> #define PCH_PORT_HOTPLUG 0xc4030 /* SHOTPLUG_CTL */
> -#define BXT_PORTA_HOTPLUG_ENABLE (1 << 28)
> -#define BXT_PORTA_HOTPLUG_STATUS_MASK (3 << 24)
> -#define BXT_PORTA_HOTPLUG_NO_DETECT (0 << 24)
> -#define BXT_PORTA_HOTPLUG_SHORT_DETECT (1 << 24)
> -#define BXT_PORTA_HOTPLUG_LONG_DETECT (2 << 24)
> +#define PORTA_HOTPLUG_ENABLE (1 << 28) /* LPT:LP+ & BXT */
Although the doc for LPT _suggests_ this is only for LPT:LP, it
doesn't mark this bit as LPT:LP-specific just like it marks all the
other LPT:LP-specific bits in every register, so I wonder if this is
really LPT:LP or if there's another way to find this out, like some
strap or VBT bit.
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> +#define PORTA_HOTPLUG_STATUS_MASK (3 << 24) /* SPT+ & BXT */
> +#define PORTA_HOTPLUG_NO_DETECT (0 << 24) /* SPT+ & BXT */
> +#define PORTA_HOTPLUG_SHORT_DETECT (1 << 24) /* SPT+ & BXT */
> +#define PORTA_HOTPLUG_LONG_DETECT (2 << 24) /* SPT+ & BXT */
> #define PORTD_HOTPLUG_ENABLE (1 << 20)
> #define PORTD_PULSE_DURATION_2ms (0 << 18)
> #define PORTD_PULSE_DURATION_4_5ms (1 << 18)
> --
> 2.4.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
