Merge branch 'bdw-fixes' into backlight-rework

Browse source

Merge the bdw changes into the backlight rework branch so that we can
adapt the new code for bdw, too.  This is a bit a mess, but doing this
another way would have delayed the merging of the backlight
refactoring. Mea culpa.

As discussed with Jani on irc only do bdw-specific callbacks for the
set/get methods and bake in the only other special-case into the pch
enable function.

Conflicts:
	drivers/gpu/drm/i915/intel_panel.c

v2: Don't enable the PWM too early for bdw (Jani).

v3: Create new bdw_ functions for setup and enable - the rules change
sufficiently imo with the switch from controlling the pwm from the cpu
to controlling it completel from the pch to warrant this.

v4: Rip out unused pipe variable in bdw_enable_backlight (0-day
builder).

Tested-by: Ben Widawsky <ben@bwidawsk.net> (on bdw)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2013-11-14 15:17:41 +01:00

parent 565ee3897f 596cc11e7a

commit 96ab4c7039

12 changed files with 182 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/gpu/drm/drm_edid.c

View file

7

drivers/gpu/drm/i915/i915_drv.h

View file

9

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

2

drivers/gpu/drm/i915/intel_opregion.c

View file

81

drivers/gpu/drm/i915/intel_panel.c

View file

18

drivers/gpu/drm/i915/intel_pm.c

View file

1

drivers/gpu/drm/i915/intel_ringbuffer.c

View file

1

drivers/gpu/drm/i915/intel_uncore.c

View file

30

drivers/gpu/drm/ttm/ttm_bo_vm.c

View file

7

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

7

drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

View file

42

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file