Daniel Vetter c09cd6e969 Merge branch 'backlight-rework' into drm-intel-next-queued ...

Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.

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

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2013-11-15 10:02:39 +01:00

..

dvo_ch7xxx.c

…

dvo_ch7017.c

…

dvo_ivch.c

…

dvo_ns2501.c

drm/i915/ns2501: Rip out the reenable hack

2013-11-04 16:32:31 +01:00

dvo_sil164.c

…

dvo_tfp410.c

…

dvo.h

…

i915_debugfs.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_dma.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_drv.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_drv.h

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_gem_context.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_gem_debug.c

…

i915_gem_dmabuf.c

…

i915_gem_evict.c

…

i915_gem_execbuffer.c

drm/i915/bdw: unleash PPGTT

2013-11-08 18:09:48 +01:00

i915_gem_gtt.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_gem_stolen.c

…

i915_gem_tiling.c

drm/i915: prevent tiling changes on framebuffer backing storage

2013-10-16 22:04:52 +02:00

i915_gem.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_gpu_error.c

drm/i915/bdw: Update relevant error state

2013-11-08 18:09:43 +01:00

i915_ioc32.c

…

i915_irq.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_reg.h

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_suspend.c

drm/i915: do not save/restore backlight registers in KMS

2013-11-14 12:22:32 +01:00

i915_sysfs.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

i915_trace_points.c

…

i915_trace.h

…

i915_ums.c

drm/i915: do not save/restore backlight registers in KMS

2013-11-14 12:22:32 +01:00

intel_acpi.c

…

intel_bios.c

drm/i915: Give names to the VBT child device type bits

2013-11-05 07:59:30 +01:00

intel_bios.h

drm/i915: Make intel_dp_is_edp() less specific

2013-11-05 07:59:40 +01:00

intel_crt.c

drm/i915: Use hsw_crt_get_config on BDW

2013-11-08 18:10:09 +01:00

intel_ddi.c

drm/i915/bdw: check DPD on port D when setting the DDI buffers

2013-11-08 18:09:58 +01:00

intel_display.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

intel_dp.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

intel_drv.h

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

intel_dsi_cmd.c

…

intel_dsi_cmd.h

…

intel_dsi_pll.c

…

intel_dsi.c

drm/i915: Use pipe_name() instead of the pipe number

2013-10-16 19:42:52 +02:00

intel_dsi.h

…

intel_dvo.c

drm/i915/dvo: call ->mode_set callback only when the port is running

2013-11-04 16:30:33 +01:00

intel_fbdev.c

drm/i915: fix open-coded DIV_ROUND_UP

2013-10-21 10:04:03 +02:00

intel_hdmi.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

intel_i2c.c

drm/i915/vlv: split CCK and DDR freq usage

2013-11-05 19:28:47 +01:00

intel_lvds.c

drm/i915: make backlight functions take a connector

2013-11-06 17:56:28 +01:00

intel_modes.c

…

intel_opregion.c

Merge branch 'bdw-fixes' into backlight-rework

2013-11-15 09:44:29 +01:00

intel_overlay.c

…

intel_panel.c

Merge branch 'bdw-fixes' into backlight-rework

2013-11-15 09:44:29 +01:00

intel_pm.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

intel_ringbuffer.c

drm/i915/bdw: Add comment about gen8 HWS PGA

2013-11-14 09:33:11 +01:00

intel_ringbuffer.h

…

intel_sdvo_regs.h

…

intel_sdvo.c

…

intel_sideband.c

drm/i915/vlv: Make the vlv_dpio_read/vlv_dpio_write more PHY centric

2013-11-11 10:57:45 +01:00

intel_sprite.c

Merge tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

2013-11-10 18:35:33 +10:00

intel_tv.c

…

intel_uncore.c

Merge branch 'backlight-rework' into drm-intel-next-queued

2013-11-15 10:02:39 +01:00

Kconfig

drm/i915: Deprecated UMS support

2013-11-14 01:42:36 +01:00

Makefile

…