[PATCH] Revert "drm/i915: assume all GM45 Acer laptops use inverted backlight PWM"

[Jani Nikula]

Ben, please pick this up for -fixes during Daniel's absense.

BR,
Jani.


On Sat, 28 Dec 2013, Alexander van Heukelum <heukelum at fastmail.fm> wrote:
> My Acer 8510TZ stops displaying anything when X starts with Linus' current
> tree. I bisected it down to commit ee1452d74584.
>
> This patch reverts commit ee1452d74584.

commit ee1452d7458451a7508e0663553ce88d63958157
Author: Jani Nikula <jani.nikula at intel.com>
Date:   Fri Sep 20 15:05:30 2013 +0300

    drm/i915: assume all GM45 Acer laptops use inverted backlight PWM

> After the revert, everything works as before.

Also

Reported-by: Dylan Borg <borgdylan at hotmail.com>

for Acer Extensa 5635Z.

> Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>

Signed-off-by: Jani Nikula <jani.nikula at intel.com>


>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 54e82a8..769b864 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10541,11 +10541,20 @@ static struct intel_quirk intel_quirks[] = {
>  	/* Sony Vaio Y cannot use SSC on LVDS */
>  	{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },
>  
> -	/*
> -	 * All GM45 Acer (and its brands eMachines and Packard Bell) laptops
> -	 * seem to use inverted backlight PWM.
> -	 */
> -	{ 0x2a42, 0x1025, PCI_ANY_ID, quirk_invert_brightness },
> +	/* Acer Aspire 5734Z must invert backlight brightness */
> +	{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
> +
> +	/* Acer/eMachines G725 */
> +	{ 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
> +
> +	/* Acer/eMachines e725 */
> +	{ 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
> +
> +	/* Acer/Packard Bell NCL20 */
> +	{ 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
> +
> +	/* Acer Aspire 4736Z */
> +	{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
>  
>  	/* Dell XPS13 HD Sandy Bridge */
>  	{ 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable },
> -- 
> 1.8.3.2
>

-- 
Jani Nikula, Intel Open Source Technology Center