diff options
| author | Daniel Vetter | 2013-11-14 15:17:41 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-11-15 09:44:29 +0100 |
| commit | 96ab4c70396e4e5a4d623bc95e86484682bef78f (patch) | |
| tree | b5f31a822c7b8c1872ce91ca2aff6506fcd26af9 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: do not save/restore backlight registers in KMS (diff) | |
| parent | drm/i915/bdw: PIPE_[BC] I[ME]R moved to powerwell (diff) | |
| download | kernel-qcow2-linux-96ab4c70396e4e5a4d623bc95e86484682bef78f.tar.gz kernel-qcow2-linux-96ab4c70396e4e5a4d623bc95e86484682bef78f.tar.xz kernel-qcow2-linux-96ab4c70396e4e5a4d623bc95e86484682bef78f.zip | |
Merge branch 'bdw-fixes' into backlight-rework
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
0 files changed, 0 insertions, 0 deletions