Dave Airlie e876b41ab0 Back merge tag 'v4.4-rc4' into drm-next ...

We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.

2015-12-08 11:04:26 +10:00

..

dvo_ch7xxx.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo_ch7017.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo_ivch.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo_ns2501.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo_sil164.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo_tfp410.c

drm/i915: Constify adjusted_mode

2015-09-30 10:20:11 +02:00

dvo.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_cmd_parser.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_debugfs.c

drm/i915: Introduce a gmbus power domain

2015-12-02 16:42:46 +02:00

i915_dma.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

i915_drv.c

drm/i915/skl: Remove unused suspend and resume callbacks

2015-11-17 20:55:21 +02:00

i915_drv.h

drm/i915: Introduce a gmbus power domain

2015-12-02 16:42:46 +02:00

i915_gem_batch_pool.c

…

i915_gem_batch_pool.h

…

i915_gem_context.c

drm/i915: Add functions to emit register offsets to the ring

2015-11-18 14:35:24 +02:00

i915_gem_debug.c

drm/i915: Implement inter-engine read-read optimisations

2015-05-21 15:11:42 +02:00

i915_gem_dmabuf.c

drm/i915: remove unused has_dma_mapping flag

2015-07-13 22:42:41 +02:00

i915_gem_evict.c

drm/i915: Remove dead i915_gem_evict_everything()

2015-10-07 16:05:40 +02:00

i915_gem_execbuffer.c

drm/i915: Add functions to emit register offsets to the ring

2015-11-18 14:35:24 +02:00

i915_gem_fence.c

Back merge tag 'v4.4-rc4' into drm-next

2015-12-08 11:04:26 +10:00

i915_gem_gtt.c

drm/i915: Stuff rotation params into view union

2015-11-19 16:42:01 +01:00

i915_gem_gtt.h

drm/i915: Fix i915_ggtt_view_equal to handle rotation correctly

2015-11-19 16:42:06 +01:00

i915_gem_render_state.c

drm/i915: Add provision to extend Golden context batch

2015-07-21 09:30:57 +02:00

i915_gem_render_state.h

drm/i915: Add provision to extend Golden context batch

2015-07-21 09:30:57 +02:00

i915_gem_shrinker.c

drm/i915: Fix kerneldoc for i915_gem_shrink_all

2015-10-13 16:21:03 +03:00

i915_gem_stolen.c

drm/i915/kbl: Introduce Kabylake platform defition.

2015-10-28 21:35:38 +02:00

i915_gem_tiling.c

drm/i915: get runtime PM reference around GEM set_tiling IOCTL

2015-11-17 18:43:30 +02:00

i915_gem_userptr.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-11-10 09:33:06 -08:00

i915_gem.c

Back merge tag 'v4.4-rc4' into drm-next

2015-12-08 11:04:26 +10:00

i915_gpu_error.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_guc_reg.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_guc_submission.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_ioc32.c

Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued

2015-07-15 16:36:50 +02:00

i915_irq.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

i915_params.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

i915_reg.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_suspend.c

drm/i915: Parametrize and fix SWF registers

2015-10-13 13:20:38 +02:00

i915_sysfs.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_trace_points.c

…

i915_trace.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

i915_vgpu.c

drm/i915: Turn __raw_i915_read8() & co. in to inline functions

2015-10-26 16:28:04 +02:00

i915_vgpu.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_acpi.c

drm/i915: Drop unnecessary #include <linux/vga_switcheroo.h>

2015-10-13 10:18:38 +02:00

intel_atomic_plane.c

drm/i915: Wait for object idle without locks in atomic_commit, v2.

2015-11-02 15:50:31 +01:00

intel_atomic.c

drm/i915: Make wait_for_flips interruptible.

2015-11-02 15:50:17 +01:00

intel_audio.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_bios.c

i915: switch from acpi_os_ioremap to memremap

2015-10-13 10:22:45 +02:00

intel_bios.h

drm/i915: Ignore "digital output" and "not HDMI output" bits for eDP detection

2015-09-23 16:58:29 +02:00

intel_crt.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_csr.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_ddi.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_display.c

Back merge tag 'v4.4-rc4' into drm-next

2015-12-08 11:04:26 +10:00

intel_dp_link_training.c

drm/i915: Make intel_dp_source_supports_hbr2() take an intel_dp pointer

2015-11-05 15:14:56 +02:00

intel_dp_mst.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_dp.c

Back merge tag 'v4.4-rc4' into drm-next

2015-12-08 11:04:26 +10:00

intel_drv.h

drm/i915: Introduce a gmbus power domain

2015-12-02 16:42:46 +02:00

intel_dsi_panel_vbt.c

drm/i915: s/dpio_lock/sb_lock/

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

intel_dsi_pll.c

drm/i915/bxt: vlv_dsi_reset_clocks() can be static

2015-10-06 10:57:06 +02:00

intel_dsi.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_dsi.h

drm/i915: fix potential dangling else problems in for_each_ macros

2015-11-25 09:29:32 +01:00

intel_dvo.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_fbc.c

drm/i915: remove in_dbg_master check from intel_fbc.c

2015-11-10 11:00:58 +01:00

intel_fbdev.c

drm/i915: Tear down fbdev if initialization fails

2015-11-19 17:52:38 +01:00

intel_fifo_underrun.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_frontbuffer.c

drm/i915: fix FBC frontbuffer tracking flushing code

2015-08-05 09:59:44 +02:00

intel_guc_fwif.h

drm/i915/guc: Add GuC css header parser

2015-10-21 14:31:34 +02:00

intel_guc_loader.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_guc.h

drm/i915/guc: Add GuC css header parser

2015-10-21 14:31:34 +02:00

intel_hdmi.c

drm/i915: take a power domain reference while checking the HDMI live status

2015-12-02 16:43:15 +02:00

intel_hotplug.c

Revert "drm/i915: Call encoder hotplug for init and resume cases"

2015-10-08 21:51:57 +02:00

intel_i2c.c

drm/i915: Introduce a gmbus power domain

2015-12-02 16:42:46 +02:00

intel_lrc.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_lrc.h

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_lvds.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_mocs.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_mocs.h

drm/i915: Added Programming of the MOCS

2015-07-14 17:13:14 +02:00

intel_modes.c

drm/i915: Add HDMI aspect ratio property for SDVO

2015-09-30 10:20:12 +02:00

intel_opregion.c

drm/i915: Don't complain about lack of ACPI video bios

2015-10-31 09:26:20 +01:00

intel_overlay.c

drm/i915: Wait for object idle without locks in atomic_commit, v2.

2015-11-02 15:50:31 +01:00

intel_panel.c

drm/i915: disable CPU PWM also on LPT/SPT backlight disable

2015-10-28 19:10:37 +02:00

intel_pm.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_psr.c

drm/i915: Send TP1 TP2/3 even when panel claims no NO_TRAIN_ON_EXIT.

2015-11-18 16:01:40 +01:00

intel_renderstate_gen6.c

…

intel_renderstate_gen7.c

…

intel_renderstate_gen8.c

…

intel_renderstate_gen9.c

…

intel_renderstate.h

…

intel_ringbuffer.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

intel_ringbuffer.h

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_runtime_pm.c

drm/i915: Introduce a gmbus power domain

2015-12-02 16:42:46 +02:00

intel_sdvo_regs.h

…

intel_sdvo.c

drm/i915: Type safe register read/write

2015-11-18 15:39:11 +02:00

intel_sideband.c

drm/i915: s/dpio_lock/sb_lock/

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

intel_sprite.c

Merge tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-12-01 08:01:53 +10:00

intel_tv.c

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

2015-09-30 08:47:41 +02:00

intel_uncore.c

Merge tag 'v4.4-rc2' into drm-intel-next-queued

2015-11-23 09:04:05 +01:00

Kconfig

drm/i915: Serialise updates to GGTT with access through GGTT on Braswell

2015-11-17 17:36:01 +01:00

Makefile

drm/i915: Move generic link training code to a separate file

2015-11-05 15:14:56 +02:00