On Thu, 23 Jan 2014, Todd Previte <tprevite@xxxxxxxxx> wrote:
> Add new definitions for hotplug live status bits for VLV2 since they're
> in reverse order from the gen4x ones.
>
> Changelog:
> - Restored gen4 bit definitions
> - Added new definitions for VLV2
> - Added platform check for IS_VALLEYVIEW() in dp_detect to use the correct
> bit defintions
>
> Signed-off-by: Todd Previte <tprevite@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 11 ++++++++---
> drivers/gpu/drm/i915/intel_dp.c | 39 +++++++++++++++++++++++++++------------
> 2 files changed, 35 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 2d77b51..0e65717 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2083,9 +2083,14 @@
> * Please check the detailed lore in the commit message for for experimental
> * evidence.
> */
> -#define PORTD_HOTPLUG_LIVE_STATUS (1 << 29)
> -#define PORTC_HOTPLUG_LIVE_STATUS (1 << 28)
> -#define PORTB_HOTPLUG_LIVE_STATUS (1 << 27)
> +/* VLV hot plug bits are different */
> +#define VLV_PORTD_HOTPLUG_LIVE_STATUS (1 << 27)
> +#define VLV_PORTC_HOTPLUG_LIVE_STATUS (1 << 28)
> +#define VLV_PORTB_HOTPLUG_LIVE_STATUS (1 << 29)
> +
> +#define PORTD_HOTPLUG_LIVE_STATUS (1 << 29)
> +#define PORTC_HOTPLUG_LIVE_STATUS (1 << 28)
> +#define PORTB_HOTPLUG_LIVE_STATUS (1 << 27)
For future reference, changes unrelated to the commit message are
generally frowned upon; style changes (like the spaces-to-tabs change
for the existing defines) should be kept separate.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> #define PORTD_HOTPLUG_INT_STATUS (3 << 21)
> #define PORTC_HOTPLUG_INT_STATUS (3 << 19)
> #define PORTB_HOTPLUG_INT_STATUS (3 << 17)
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1386efb..1f080b2 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2946,18 +2946,33 @@ g4x_dp_detect(struct intel_dp *intel_dp)
> return status;
> }
>
> - switch (intel_dig_port->port) {
> - case PORT_B:
> - bit = PORTB_HOTPLUG_LIVE_STATUS;
> - break;
> - case PORT_C:
> - bit = PORTC_HOTPLUG_LIVE_STATUS;
> - break;
> - case PORT_D:
> - bit = PORTD_HOTPLUG_LIVE_STATUS;
> - break;
> - default:
> - return connector_status_unknown;
> + if (IS_VALLEYVIEW(dev)) {
> + switch (intel_dig_port->port) {
> + case PORT_B:
> + bit = VLV_PORTB_HOTPLUG_LIVE_STATUS;
> + break;
> + case PORT_C:
> + bit = VLV_PORTC_HOTPLUG_LIVE_STATUS;
> + break;
> + case PORT_D:
> + bit = VLV_PORTD_HOTPLUG_LIVE_STATUS;
> + break;
> + default:
> + return connector_status_unknown;
> + } else {
> + switch (intel_dig_port->port) {
> + case PORT_B:
> + bit = PORTB_HOTPLUG_LIVE_STATUS;
> + break;
> + case PORT_C:
> + bit = PORTC_HOTPLUG_LIVE_STATUS;
> + break;
> + case PORT_D:
> + bit = PORTD_HOTPLUG_LIVE_STATUS;
> + break;
> + default:
> + return connector_status_unknown;
> + }
> }
>
> if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0)
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
