proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2026-01-04 19:18:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
cb54b53ada
mirror_ubuntu-kernels/drivers/gpu/drm/i915
History
Daniel Vetter cb54b53ada Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 
This backmerges Linus' merge commit of the latest drm-fixes pull:

commit 549f3a1218
Merge: 42577ca 058ca4a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jul 23 15:47:08 2013 -0700

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

We've accrued a few too many conflicts, but the real reason is that I
want to merge the 100% solution for Haswell concurrent registers
writes into drm-intel-next. But that depends upon the 90% bandaid
merged into -fixes:

commit a7cd1b8fea
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Jul 19 20:36:51 2013 +0100

    drm/i915: Serialize almost all register access

Also, we can roll up on accrued conflicts.

Usually I'd backmerge a tagged -rc, but I want to get this done before
heading off to vacations next week ;-)

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_gem.c

v2: For added hilarity we have a init sequence conflict around the
gt_lock, so need to move that one, too. Spotted by Jani Nikula.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-07-25 15:18:41 +02:00
..
dvo_ch7xxx.c drm/i915: add support for dvo Chrontel 7010B 2013-05-20 22:02:49 +02:00
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
dvo.h
i915_debugfs.c drm/intel: add enable_psr module option and disable psr by default 2013-07-18 10:17:36 +02:00
i915_dma.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
i915_drv.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
i915_drv.h Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
i915_gem_context.c drm/i915: Fix retrieval of hangcheck stats 2013-07-16 10:40:25 +02:00
i915_gem_debug.c drm/i915: Move active/inactive lists to new mm 2013-07-17 22:24:32 +02:00
i915_gem_dmabuf.c drm/i915: fix dmabuf vmap support 2013-05-01 16:09:31 +10:00
i915_gem_evict.c drm/i915: Create VMAs 2013-07-18 08:46:13 +02:00
i915_gem_execbuffer.c drm/i915: add prefault_disable module option 2013-07-19 09:29:26 +02:00
i915_gem_gtt.c drm/i915: Create VMAs 2013-07-18 08:46:13 +02:00
i915_gem_stolen.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
i915_gem_tiling.c drm/i915: Getter/setter for object attributes 2013-07-08 22:04:34 +02:00
i915_gem.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
i915_gpu_error.c drm/i915: Move active/inactive lists to new mm 2013-07-17 22:24:32 +02:00
i915_ioc32.c
i915_irq.c drm/i915: invert {ilk, snb}_gt_irq_handler check 2013-07-20 10:49:03 +02:00
i915_reg.h drm/i915: add functions to disable and restore LCPLL 2013-07-24 10:37:10 +02:00
i915_suspend.c Linux 3.10 2013-07-18 12:03:29 +02:00
i915_sysfs.c drm/i915: add error_state sysfs entry 2013-07-01 19:39:31 +02:00
i915_trace_points.c
i915_trace.h drm/i915: Getter/setter for object attributes 2013-07-08 22:04:34 +02:00
i915_ums.c drm/i915: scrap register address storage 2013-06-10 19:54:14 +02:00
intel_acpi.c
intel_bios.c drm/i915: Organize VBT stuff inside drm_i915_private 2013-05-10 21:56:46 +02:00
intel_bios.h drm/i915: set CPT FDI RX polarity bits based on VBT 2013-04-18 09:43:31 +02:00
intel_crt.c drm/i915: Add some debug breadcrumbs to connector detection 2013-07-24 10:37:07 +02:00
intel_ddi.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_display.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_dp.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_drv.h Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_dvo.c drm/i915: Add some debug breadcrumbs to connector detection 2013-07-24 10:37:07 +02:00
intel_fb.c drm/i915: Getter/setter for object attributes 2013-07-08 22:04:34 +02:00
intel_hdmi.c drm/i915: Add some debug breadcrumbs to connector detection 2013-07-24 10:37:07 +02:00
intel_i2c.c drm/i915: avoid premature DP AUX timeouts 2013-05-22 13:51:26 +02:00
intel_lvds.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_modes.c drm/i915: Add "Automatic" mode for the "Broadcast RGB" property 2013-01-20 13:09:44 +01:00
intel_opregion.c drm/i915: tune down DIDL warning about too many outputs 2013-07-01 11:14:42 +02:00
intel_overlay.c drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL 2013-07-24 10:37:11 +02:00
intel_panel.c drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight 2013-07-20 10:52:53 +02:00
intel_pm.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_ringbuffer.c Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' 2013-07-25 15:18:41 +02:00
intel_ringbuffer.h drm/i915: unify ring irq refcounts (again) 2013-07-11 14:36:49 +02:00
intel_sdvo_regs.h
intel_sdvo.c drm/i915: Add some debug breadcrumbs to connector detection 2013-07-24 10:37:07 +02:00
intel_sideband.c drm/i915: change VLV IOSF sideband accessors to not return error code 2013-05-23 23:25:42 +02:00
intel_sprite.c drm/i915: Getter/setter for object attributes 2013-07-08 22:04:34 +02:00
intel_tv.c drm/i915: Add some debug breadcrumbs to connector detection 2013-07-24 10:37:07 +02:00
Makefile drm/i915: move error state to own compilation unit 2013-07-12 18:53:13 +02:00