Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

DRM/i915: Get rid if the 'hotplug_supported_mask' in struct drm_i915_private.

Now since we have replaced the bits to show interest in hotplug IRQs
we can go and nuke the 'hotplug_supported_mask'.

Signed-off-by: Egbert Eich <eich@suse.de>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Egbert Eich and committed by
Daniel Vetter
4f770a5b bac56d5b

+3 -15
-1
drivers/gpu/drm/i915/i915_drv.h
··· 922 922 u32 irq_mask; 923 923 u32 gt_irq_mask; 924 924 925 - u32 hotplug_supported_mask; 926 925 struct work_struct hotplug_work; 927 926 bool enable_hotplug_processing; 928 927
-2
drivers/gpu/drm/i915/intel_crt.c
··· 799 799 */ 800 800 crt->force_hotplug_required = 0; 801 801 802 - dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS; 803 - 804 802 /* 805 803 * TODO: find a proper way to discover whether we need to set the the 806 804 * polarity and link reversal bits or not, instead of relying on the
-3
drivers/gpu/drm/i915/intel_dp.c
··· 2825 2825 name = "DPDDC-A"; 2826 2826 break; 2827 2827 case PORT_B: 2828 - dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS; 2829 2828 intel_encoder->hpd_pin = HPD_PORT_B; 2830 2829 name = "DPDDC-B"; 2831 2830 break; 2832 2831 case PORT_C: 2833 - dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS; 2834 2832 intel_encoder->hpd_pin = HPD_PORT_C; 2835 2833 name = "DPDDC-C"; 2836 2834 break; 2837 2835 case PORT_D: 2838 - dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS; 2839 2836 intel_encoder->hpd_pin = HPD_PORT_D; 2840 2837 name = "DPDDC-D"; 2841 2838 break;
-3
drivers/gpu/drm/i915/intel_hdmi.c
··· 989 989 case PORT_B: 990 990 intel_hdmi->ddc_bus = GMBUS_PORT_DPB; 991 991 intel_encoder->hpd_pin = HPD_PORT_B; 992 - dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS; 993 992 break; 994 993 case PORT_C: 995 994 intel_hdmi->ddc_bus = GMBUS_PORT_DPC; 996 995 intel_encoder->hpd_pin = HPD_PORT_C; 997 - dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS; 998 996 break; 999 997 case PORT_D: 1000 998 intel_hdmi->ddc_bus = GMBUS_PORT_DPD; 1001 999 intel_encoder->hpd_pin = HPD_PORT_D; 1002 - dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS; 1003 1000 break; 1004 1001 case PORT_A: 1005 1002 intel_encoder->hpd_pin = HPD_PORT_A;
+3 -6
drivers/gpu/drm/i915/intel_sdvo.c
··· 2779 2779 SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915; 2780 2780 } 2781 2781 2782 + /* Only enable the hotplug irq if we need it, to work around noisy 2783 + * hotplug lines. 2784 + */ 2782 2785 if (intel_sdvo->hotplug_active) 2783 2786 intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C; 2784 2787 ··· 2812 2809 * cloning for SDVO encoders. 2813 2810 */ 2814 2811 intel_sdvo->base.cloneable = false; 2815 - 2816 - /* Only enable the hotplug irq if we need it, to work around noisy 2817 - * hotplug lines. 2818 - */ 2819 - if (intel_sdvo->hotplug_active) 2820 - dev_priv->hotplug_supported_mask |= hotplug_mask; 2821 2812 2822 2813 intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg); 2823 2814