OSDN Git Service

(root) / android-x86 / external-libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a2d02b 54df1b9)
Merge branch 'master' into modesetting-101 - TTM & typedef removal
authorJesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Mon, 24 Sep 2007 21:41:46 +0000 (14:41 -0700)
committerJesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Mon, 24 Sep 2007 21:41:46 +0000 (14:41 -0700)
commit5cc3083179b19678456905a9122a3d0f04e6f623
tree9b776bdd317aa5af68b7cbf8fabde12e20eccf8atree | snapshot
parent2a2d02bbc500140a861380df52ce66abcac39312commit | diff
parent54df1b9ff3b79097fedd8ed7bf54aca30a660cbdcommit | diff
Merge branch 'master' into modesetting-101 - TTM & typedef removal

Conflicts:

linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c

Mostly removing typedefs that snuck into the modesetting code and
updating to the latest TTM APIs.  As of today, the i915 driver builds,
but there are likely to be problems, so debugging and bugfixes will
come next.
30 files changed:
linux-core/Makefile.kernel diff1 | diff2 | blob | history
linux-core/drmP.h diff1 | diff2 | blob | history
linux-core/drm_bo.c diff1 | diff2 | blob | history
linux-core/drm_bo_move.c diff1 | diff2 | blob | history
linux-core/drm_bufs.c diff1 | diff2 | blob | history
linux-core/drm_compat.h diff1 | diff2 | blob | history
linux-core/drm_crtc.c diff1 | | blob | history
linux-core/drm_crtc.h diff1 | | blob | history
linux-core/drm_drv.c diff1 | diff2 | blob | history
linux-core/drm_edid.c diff1 | | blob | history
linux-core/drm_fops.c diff1 | diff2 | blob | history
linux-core/drm_objects.h diff1 | diff2 | blob | history
linux-core/drm_stub.c diff1 | diff2 | blob | history
linux-core/i915_buffer.c diff1 | diff2 | blob | history
linux-core/i915_drv.c diff1 | diff2 | blob | history
linux-core/i915_fence.c diff1 | diff2 | blob | history
linux-core/intel_crt.c diff1 | | blob | history
linux-core/intel_display.c diff1 | | blob | history
linux-core/intel_drv.h diff1 | | blob | history
linux-core/intel_fb.c diff1 | | blob | history
linux-core/intel_i2c.c diff1 | | blob | history
linux-core/intel_lvds.c diff1 | | blob | history
linux-core/intel_sdvo.c diff1 | | blob | history
shared-core/drm.h diff1 | diff2 | blob | history
shared-core/i915_dma.c diff1 | diff2 | blob | history
shared-core/i915_drm.h diff1 | diff2 | blob | history
shared-core/i915_drv.h diff1 | diff2 | blob | history
shared-core/i915_init.c diff1 | | blob | history
shared-core/i915_irq.c diff1 | diff2 | blob | history
shared-core/i915_mem.c diff1 | diff2 | blob | history
external/libdrm
About OSDN
Find Software
Develop Software
Help