[Intel-gfx] [PATCH 3/3] drm/i915: Remove dead code from SDVO initialisation

[Daniel Vetter]

On Sun, Jun 09, 2013 at 04:02:05PM +0100, Chris Wilson wrote:
> The hotplug_mask is no longer used as the hpd interrupt setup is now
> handled in the core.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

First two patches merged to -fixes with the missing regression notes
added, last one merged to dinq. Also cc'ing Egbert now.

Thanks for tracking this down.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_sdvo.c |   13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index a939591..89ee792 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2852,7 +2852,6 @@ 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);
>  	if (!intel_sdvo)
> @@ -2881,18 +2880,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
>  		}
>  	}
>  
> -	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;
> -	}
> -
>  	intel_encoder->compute_config = intel_sdvo_compute_config;
>  	intel_encoder->disable = intel_disable_sdvo;
>  	intel_encoder->mode_set = intel_sdvo_mode_set;
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch