[Intel-gfx] [Patch] Disabling the pipe A quirk for the Fujitsu S6010

[Daniel Vetter]

On Mon, Jun 02, 2014 at 05:38:13PM +0200, Thomas Richter wrote:
> Hi Daniel, hi others,
> 
> please find a patch attached that disables the pipe A quirk for the Fujitsu
> S6010. I will probably add a line for the R31 later, I only
> need to add the model number.
> 
> How is the watermark-alignment patch for the 830 doing, btw?
> 
> Greetings,
> 	Thomas
> 

> From 2006abcd850f8c0995153ffb491efd590103f17f Mon Sep 17 00:00:00 2001
> From: thor <thor at math.tu-berlin.de>
> Date: Mon, 2 Jun 2014 17:32:55 +0200
> Subject: [PATCH 2/2] Disabling the pipe A quirk for the Fujitsu S6010.
> 
> Signed-off-by: thor <thor at math.tu-berlin.de>

Like I've explained, this is nacked. I'll merge the patch I've wanted now.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c |   15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 54095d4..02b6525 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11535,6 +11535,18 @@ static void quirk_pipea_force(struct drm_device *dev)
>  }
>  
>  /*
> + * Some 830 based systems do not work with the pipe A quirk
> + * correctly since they do not use pipe A in first place
> + */
> +static void quirk_disable_pipea_force(struct drm_device *dev)
> +{
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +
> +	dev_priv->quirks &= ~QUIRK_PIPEA_FORCE;
> +	DRM_INFO("removing the pipe a force quirk for this hardware\n");
> +}
> +
> +/*
>   * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason
>   */
>  static void quirk_ssc_force_disable(struct drm_device *dev)
> @@ -11603,6 +11615,9 @@ static struct intel_quirk intel_quirks[] = {
>  	/* 830 needs to leave pipe A & dpll A up */
>  	{ 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
>  
> +	/* However, do not enable the quirk on S6010 */
> +	{ 0x3577, 0x10cf, 0x113c, quirk_disable_pipea_force },
> +
>  	/* Lenovo U160 cannot use SSC on LVDS */
>  	{ 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable },
>  
> -- 
> 1.7.10.4
> 


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