Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
738c05c07d
linux/drivers/gpu/drm/vmwgfx
History
Daniel Vetter 54499b2a92 Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued 
So with all the code movement and extraction in intel_pm.c in -next
git is hopelessly confused with

commit 2208d655a9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Nov 14 09:25:29 2014 +0100

    drm/i915: drop WaSetupGtModeTdRowDispatch:snb

from -fixes. Worse even small changes in -next move around the
conflict context so rerere is equally useless. Let's just backmerge
and be done with it.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c

Except for git getting lost no tricky conflicts really.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2014-11-19 18:17:38 +01:00
..
Kconfig drm: Move plane helpers into drm_kms_helper.ko 2014-06-04 13:36:08 +10:00
Makefile drm/vmwgfx: Fix compat shader namespace 2014-07-04 12:12:09 +02:00
svga3d_reg.h drm/vmwgfx: Remove some unused surface formats 2014-03-02 09:42:53 +01:00
svga3d_surfacedefs.h drm/vmwgfx: Fix possible integer overflow 2014-02-12 19:30:45 +01:00
svga_escape.h
svga_overlay.h
svga_reg.h PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h 2014-09-24 11:52:09 -06:00
svga_types.h
vmwgfx_buffer.c drm/ttm: flip the switch, and convert to dma_fence 2014-09-02 16:41:50 +02:00
vmwgfx_cmdbuf_res.c drm/vmwgfx: Fix hash key computation 2014-10-31 09:54:22 +01:00
vmwgfx_context.c drm/vmwgfx: Fix compat shader namespace 2014-07-04 12:12:09 +02:00
vmwgfx_dmabuf.c drm/ttm: move fpfn and lpfn into each placement v2 2014-08-27 13:16:04 +02:00
vmwgfx_drv.c drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size. 2014-10-31 09:58:06 +01:00
vmwgfx_drv.h drm/vmwgfx: rework to new fence interface, v2 2014-09-02 16:41:50 +02:00
vmwgfx_execbuf.c Linux 3.17-rc5 2014-09-16 11:38:04 +10:00
vmwgfx_fb.c drm/ttm: move fpfn and lpfn into each placement v2 2014-08-27 13:16:04 +02:00
vmwgfx_fence.c drm/vmwgfx: rework to new fence interface, v2 2014-09-02 16:41:50 +02:00
vmwgfx_fence.h drm/vmwgfx: rework to new fence interface, v2 2014-09-02 16:41:50 +02:00
vmwgfx_fifo.c Linux 3.17-rc5 2014-09-16 11:38:04 +10:00
vmwgfx_gmr.c drm/vmwgfx: Fix the driver for large dma addresses 2014-01-17 07:44:15 +01:00
vmwgfx_gmrid_manager.c drm/ttm: move fpfn and lpfn into each placement v2 2014-08-27 13:16:04 +02:00
vmwgfx_ioctl.c drm/vmwgfx: Use a per-device semaphore for reservation protection 2014-03-28 14:19:02 +01:00
vmwgfx_irq.c drm: Kill DRM_IRQ_ARGS 2013-12-18 11:33:46 +10:00
vmwgfx_kms.c drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size. 2014-10-31 09:58:06 +01:00
vmwgfx_kms.h drm: Pass page flip ioctl flags to driver 2013-08-30 09:24:54 +10:00
vmwgfx_ldu.c drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h 2014-11-05 00:14:55 +01:00
vmwgfx_marker.c drm: vmwgfx: Use nsec based interfaces 2014-07-23 15:01:50 -07:00
vmwgfx_mob.c drm/vmwgfx: avoid null pointer dereference at failure paths 2014-03-02 09:49:59 +01:00
vmwgfx_overlay.c
vmwgfx_prime.c drm/vmwgfx: Hook up the prime ioctls 2013-11-18 04:11:53 -08:00
vmwgfx_reg.h
vmwgfx_resource_priv.h
vmwgfx_resource.c drm/ttm: add reservation_object as argument to ttm_bo_init 2014-09-30 14:04:00 +02:00
vmwgfx_scrn.c drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h 2014-11-05 00:14:55 +01:00
vmwgfx_shader.c drm/vmwgfx: Fix compat shader namespace 2014-07-04 12:12:09 +02:00
vmwgfx_surface.c drm/vmwgfx: Tighten security around surface sharing v2 2014-03-28 14:19:03 +01:00
vmwgfx_ttm_glue.c