summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-03-07worst merge effort everDave Airlie
2008-03-07drm/modesetting: fixup irq removal on exitDave Airlie
2008-03-07Merge branch 'master' of ../../drm into modesetting-101Dave Airlie
2008-03-07flush_agp_mappings commitDave Airlie
2008-03-07I really screwed up that merge somehowDave Airlie
2008-03-07drm: fixup for new sysfs APIDave Airlie
2008-03-07woah somehow got these upstreamDave Airlie
2008-03-06drm/bo: allow non-suser priv to add kernel BOs.Dave Airlie
modprobe can be run with dropped capabilities we still want the kernel bos to work.
2008-03-05build fixAlan Hourihane
2008-03-05Add property info.Alan Hourihane
fix bo handle
2008-03-05Check mode before adding to EDIDAlan Hourihane
2008-03-05Use ARRAY_SIZEAlan Hourihane
2008-03-05propogate failed fixups back upAlan Hourihane
2008-03-05Fix connector description tableAlan Hourihane
2008-03-06Merge branch 'master' of ../../drm into modesetting-101Dave Airlie
Conflicts: shared-core/drm.h
2008-03-06ttm: make sure userspace can't destroy kernel create memory managersDave Airlie
this adds something to say the kernel initialised the memory region not the userspace. and blocks userspace from deallocating kernel areas
2008-03-06drm/ttm: add ioctl to get back memory managed area sizedDave Airlie
taken from modesetting branch but could be useful outside it.
2008-03-06Merge branch 'master' of ../../drm into modesetting-101Dave Airlie
Conflicts: linux-core/drmP.h linux-core/drm_drv.c linux-core/drm_proc.c linux-core/drm_stub.c linux-core/drm_sysfs.c
2008-03-06drm: reorganise minor number handling using code from modesetting branchDave Airlie
Rip out the whole head thing and replace it with an idr and drm_minor structure.
2008-03-05drm: Fix for non-coherent DMA PowerPCBenjamin Herrenschmidt
This patch fixes bits of the DRM so to make the radeon DRI work on non-cache coherent PCI DMA variants of the PowerPC processors. It moves the few places that needs change to wrappers to that other architectures with similar issues can easily add their own changes to those wrappers, at least until we have more useful generic kernel API. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2008-03-05i915: Evict if relocatee buffer is CACHED_MAPPED beforeXiang, Haihao
writting relocations, otherwise the GPU probably sees some inconsistent data. Fix fd.o bug#14656
2008-03-05fixup previous mergeDave Airlie
2008-03-05drm: fixup compat with old x.org driversDave Airlie
2008-03-05libdrm: fix warnings in mode codeDave Airlie
2008-03-05Merge remote branch 'origin/master' into modesetting-101Dave Airlie
Conflicts: linux-core/drm_compat.c
2008-03-05remove unused functions + include header fileDave Airlie
2008-03-04Clarify when WAIT_LAZY is relevant to users.Eric Anholt
2008-03-04Remove unused DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS.Eric Anholt
2008-03-04Clarify through the names what drm_ttm_alloc_pages() and friend actually did.Eric Anholt
These are all about the page directory (pointers to pages) rather than the actual pages backing the allocation.
2008-03-04Don't shortcut the info syscall for drmBOBusy on nonshareable objects.Eric Anholt
This broke the results when you're trying to check if a buffer you dispatched some time ago is done being rendered from.
2008-03-03 [i915] 2D driver may reset Frame count value, this may lead driverZou Nan hai
to leap it's vblank count a huge value. This will stall some applications that switch video mode if vblank_mode is set to a non zero value in drirc.
2008-03-02Add FENCE registers to MMIO listAlan Hourihane
2008-02-29FIX_KMAP_BEGIN requires CONFIG_HIMEM (see include/asm-i386.h/fixmap.h)Patrice Mandin
2008-02-29Fix compilation breakage on x86-64.Thomas Hellstrom
2008-02-29drm: change fb api to take a bo handle not the bo pointer.Dave Airlie
2008-02-29agp: export the correct symbolDave Airlie
2008-02-28Add a compat kmap_atomic_prot_pfn to do quick kernel map / unmaps ofThomas Hellstrom
PCI- or high memory. This is substantially more efficient than drm_bo_kmap, since the mapping only lives on a single processor. Unmapping is done use kunmap_atomic(). Flushes only a single tlb() entry. Add a support utility int drm_bo_pfn_prot() that returns the pfn and desired page protection for a given bo offset. This is all intended for relocations in bound TTMS or vram. Mapping-accessing-unmapping must be atomic, either using preempt_xx() macros or a spinlock.
2008-02-28drm: add modesetting as a driver feature.Dave Airlie
This change adds a driver feature that for i915 is controlled by a module parameter. You now need to do insmod i915.ko modeset=1 to enable it the modesetting paths. It also fixes up lots of X paths. I can run my new DDX driver on this code with and without modesetting enabled
2008-02-28drm: add a check for if modesetting is supported.Dave Airlie
This is Linux only code, it just uses sysfs to see if a control device has been registered on the requested PCI ID
2008-02-27Reinstate buffer idle before applying relocations.Thomas Hellstrom
2008-02-27Don't wait for buffer idle before applying relocations.Thomas Hellstrom
2008-02-26radeon: remove TTM from an earlier mergeJerome Glisse
2008-02-26Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into ↵Alan Hourihane
modesetting-101 Conflicts: shared-core/i915_dma.c
2008-02-26DRM_INFO -> DRM_DEBUGAlan Hourihane
2008-02-26DRM_INFO -> DRM_DEBUGAlan Hourihane
2008-02-26define PRETHAWAlan Hourihane
2008-02-26Implement short circuit for base change onlyAlan Hourihane
Allow mode to be set with fb_id set to -1, meaning set the mode with the current fb (if we have one bound). Allow intelfb to hook back up it's fb if modesetting clears it (maybe temporary). Move any crtc->fb related register changes to set_base in intel_fb. General intelfb cleanups.
2008-02-26[i915] Relocation fixes.Thomas Hellstrom
2008-02-26i915: fix typosDave Airlie
2008-02-26i915_mmio: add overlay regsDave Airlie