[Intel-gfx] [PATCH] drm/i915: default to having backlight if VBT not available

[Jani Nikula]

On Wed, 18 Jun 2014, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Tue, Jun 17, 2014 at 03:47:05PM +0300, Jani Nikula wrote:
>> Apparently there are Apple laptops with magic smoke for a VBIOS, which
>> we fail to find and use. Default to having and setting up backlight in
>> this case.
>> 
>> This fixes a regression introduced by
>> commit c675949ec58ca50d5a3ae3c757892f1560f6e896
>> Author: Jani Nikula <jani.nikula at intel.com>
>> Date:   Wed Apr 9 11:31:37 2014 +0300
>> 
>>     drm/i915: do not setup backlight if not available according to VBT
>> 
>> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=77831
>> Reported-by: Matteo Cypriani <mcy at lm7.fr>
>> Cc: stable at vger.kernel.org # 3.15+
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> Tested-by: Matteo Cypriani <mcy at lm7.fr>

Pushed to -fixes with Imre's IRC r-b.

BR,
Jani.


>
>> ---
>>  drivers/gpu/drm/i915/intel_bios.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 1ee98f121a00..827498e081df 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -315,9 +315,6 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
>>  	const struct bdb_lfp_backlight_data *backlight_data;
>>  	const struct bdb_lfp_backlight_data_entry *entry;
>>  
>> -	/* Err to enabling backlight if no backlight block. */
>> -	dev_priv->vbt.backlight.present = true;
>> -
>>  	backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT);
>>  	if (!backlight_data)
>>  		return;
>> @@ -1088,6 +1085,9 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
>>  
>>  	dev_priv->vbt.crt_ddc_pin = GMBUS_PORT_VGADDC;
>>  
>> +	/* Default to having backlight */
>> +	dev_priv->vbt.backlight.present = true;
>> +
>>  	/* LFP panel data */
>>  	dev_priv->vbt.lvds_dither = 1;
>>  	dev_priv->vbt.lvds_vbt = 0;
>> -- 
>> 1.9.1
>> 
>> _______________________________________________
>> 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

-- 
Jani Nikula, Intel Open Source Technology Center