Dave Airlie bdcddf95e8 Backmerge v4.1-rc4 into into drm-next ...

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c

2015-05-20 16:23:53 +10:00

..

dvo_ch7xxx.c

…

dvo_ch7017.c

…

dvo_ivch.c

Enabled dithering in the intel VCH DVO for 18bpp pipelines.

2015-03-30 16:39:31 +02:00

dvo_ns2501.c

drm/i915: Enable dithering on NatSemi DVO2501 for Fujitsu S6010

2015-04-23 21:31:58 +02:00

dvo_sil164.c

…

dvo_tfp410.c

…

dvo.h

…

i915_cmd_parser.c

drm/i915: Tidy batch pool logic

2015-04-10 08:56:04 +02:00

i915_debugfs.c

drm/i915: Move toggling planes out of crtc enable/disable.

2015-05-08 13:03:56 +02:00

i915_dma.c

drm/i915/skl: Add support to load SKL CSR firmware.

2015-05-08 13:03:10 +02:00

i915_drv.c

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +10:00

i915_drv.h

drm/i915: Update DRIVER_DATE to 20150508

2015-05-08 17:38:19 +02:00

i915_gem_batch_pool.c

drm/i915: Split batch pool into size buckets

2015-04-10 08:56:05 +02:00

i915_gem_batch_pool.h

drm/i915: Split batch pool into size buckets

2015-04-10 08:56:05 +02:00

i915_gem_context.c

drm/i915: Don't use atomics for pg_dirty_rings

2015-04-23 21:06:02 +02:00

i915_gem_debug.c

…

i915_gem_dmabuf.c

dma-buf: cleanup dma_buf_export() to make it easily extensible

2015-04-21 14:47:16 +05:30

i915_gem_evict.c

drm/i915: kerneldoc for i915_gem_shrinker.c

2015-03-20 11:48:16 +01:00

i915_gem_execbuffer.c

drm/i915: Fix possible security hole in command parsing

2015-05-08 17:26:01 +02:00

i915_gem_gtt.c

drm/i915: Add a partial GGTT view type

2015-05-08 13:04:18 +02:00

i915_gem_gtt.h

drm/i915: Add a partial GGTT view type

2015-05-08 13:04:18 +02:00

i915_gem_render_state.c

…

i915_gem_render_state.h

…

i915_gem_shrinker.c

drm/i915: Simplify object is-pinned checking for shrinker

2015-04-10 10:58:34 +02:00

i915_gem_stolen.c

drm/i915: use proper FBC base register on all new platforms

2015-04-09 15:57:46 +02:00

i915_gem_tiling.c

drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling

2015-04-16 11:20:29 +02:00

i915_gem_userptr.c

drm/i915: get rid of -Iinclude/drm

2015-05-13 11:28:21 +02:00

i915_gem.c

drm/i915: Reject huge tiled objects

2015-05-08 17:25:29 +02:00

i915_gpu_error.c

drm/i915: Free wa_batchbuffer when freeing error state

2015-05-08 13:03:37 +02:00

i915_ioc32.c

…

i915_irq.c

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-08 20:51:06 +10:00

i915_params.c

drm/i915/skl: Add module parameter to select edp vswing table

2015-05-08 13:03:41 +02:00

i915_reg.h

drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV

2015-05-08 15:56:30 +02:00

i915_suspend.c

drm/i915: Remove regfile code&data for UMS suspend/resume

2015-02-27 18:10:39 +01:00

i915_sysfs.c

drm/i915/skl: Updated the act_freq_mhz_show sysfs function

2015-03-17 22:30:25 +01:00

i915_trace_points.c

…

i915_trace.h

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-08 20:51:06 +10:00

i915_vgpu.c

drm/i915: Adds graphic address space ballooning logic

2015-02-13 23:28:23 +01:00

i915_vgpu.h

drm/i915: Add ULL postfix to VGT_MAGIC constant

2015-03-17 22:30:18 +01:00

intel_acpi.c

…

intel_atomic_plane.c

drm/i915: Use atomic helpers for computing changed flags

2015-05-08 13:04:08 +02:00

intel_atomic.c

drm/i915: Call drm helpers when duplicating crtc and plane states

2015-05-08 13:03:58 +02:00

intel_audio.c

drm/i915/audio: do not mess with audio registers if port is invalid

2015-05-08 13:03:36 +02:00

intel_bios.c

drm/i915/skl: Add module parameter to select edp vswing table

2015-05-08 13:03:41 +02:00

intel_bios.h

drm/i915: Fix the VBT child device parsing for BSW

2015-04-10 08:56:14 +02:00

intel_crt.c

drm/i915: Allocate connector state together with the connectors

2015-04-13 15:21:21 +03:00

intel_csr.c

drm/i915/skl: Assert the requirements to enter or exit DC5.

2015-05-08 13:03:13 +02:00

intel_ddi.c

drm/i915/skl: Re-indent part of skl_ddi_calculate_wrpll()

2015-05-08 13:04:18 +02:00

intel_display.c

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +10:00

intel_dp_mst.c

drm/i915: Use for_each_connector_in_state helper macro

2015-05-08 13:03:58 +02:00

intel_dp.c

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +10:00

intel_drv.h

drm/i915: Only wait for required lanes in vlv_wait_port_ready()

2015-05-08 17:26:02 +02:00

intel_dsi_panel_vbt.c

drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein

2015-01-29 16:57:14 +01:00

intel_dsi_pll.c

…

intel_dsi.c

drm/i915: Allocate connector state together with the connectors

2015-04-13 15:21:21 +03:00

intel_dsi.h

drm/i915/dsi: add drm mipi dsi host support

2015-01-29 16:51:39 +01:00

intel_dvo.c

drm/i915: Silence compiler warning in dvo

2015-04-29 14:37:48 +03:00

intel_fbc.c

drm/i915: get rid of primary_enabled and use atomic state

2015-05-08 13:03:53 +02:00

intel_fbdev.c

drm/i915: Pass in plane state when (un)pinning frame buffers

2015-03-23 15:00:57 +01:00

intel_fifo_underrun.c

drm/i915: Check for driver readyness before handling an underrun interrupt

2015-03-04 10:04:19 +02:00

intel_frontbuffer.c

drm/i915: PSR VLV: Add single frame update.

2015-04-14 19:15:23 +02:00

intel_hdmi.c

drm/i915: Only wait for required lanes in vlv_wait_port_ready()

2015-05-08 17:26:02 +02:00

intel_i2c.c

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-08 20:51:06 +10:00

intel_lrc.c

drm/i915: checking IS_ERR() instead of NULL

2015-05-08 13:03:23 +02:00

intel_lrc.h

drm/i915: Move common request allocation code into a common function

2015-04-01 07:54:30 +02:00

intel_lvds.c

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +10:00

intel_modes.c

…

intel_opregion.c

drm/i915: Remove DRIVER_MODESET checks from modeset code

2015-02-27 18:10:53 +01:00

intel_overlay.c

drm/i915: Allow disabling the destination colorkey for overlay

2015-04-10 08:55:54 +02:00

intel_panel.c

drm/i915/bxt: BLC implementation

2015-05-08 13:03:38 +02:00

intel_pm.c

drm/i915/skl: Fix WaDisableChickenBitTSGBarrierAckForFFSliceCS

2015-05-08 13:03:44 +02:00

intel_psr.c

drm/i915: PSR VLV: Add single frame update.

2015-04-14 19:15:23 +02:00

intel_renderstate_gen6.c

…

intel_renderstate_gen7.c

…

intel_renderstate_gen8.c

…

intel_renderstate_gen9.c

…

intel_renderstate.h

…

intel_ringbuffer.c

drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.

2015-05-08 13:04:16 +02:00

intel_ringbuffer.h

drm/i915: Split the batch pool by engine

2015-04-10 08:56:04 +02:00

intel_runtime_pm.c

Revert "drm/i915: Hack to tie both common lanes together on chv"

2015-05-08 15:56:42 +02:00

intel_sdvo_regs.h

…

intel_sdvo.c

drm/i915: Use POSTING_READ() in intel_sdvo_write_sdvox()

2015-05-08 13:03:39 +02:00

intel_sideband.c

drm/i915: Correct the IOSF Dev_FN field for IOSF transfers

2015-02-09 14:26:19 +02:00

intel_sprite.c

drm/i915: Move intel_(pre_disable/post_enable)_primary to intel_display.c, and use it there.

2015-05-08 13:03:54 +02:00

intel_tv.c

drm/i915: Allocate connector state together with the connectors

2015-04-13 15:21:21 +03:00

intel_uncore.c

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-08 20:51:06 +10:00

Kconfig

drm/i915/dsi: add drm mipi dsi host support

2015-01-29 16:51:39 +01:00

Makefile

Merge tag 'topic/drm-misc-2015-05-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-20 09:19:58 +10:00