aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAge
* drm: fix brace placementDave Airlie2006-02-18
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon add r300 TX_CNTL and verify bitblt packetsDave Airlie2006-02-17
| | | | | | | The Xgl on r300 doesn't work unless you add a verify bitblt function to the DRM, and we need to pass TX_CNTL to flush texture caches. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup i915 interrupt on X server exitDave Airlie2006-02-17
| | | | | | Fixes: IRQ disabled (i915?) when switchig between gnome themes (gnome-theme-manager) Signed-off-by: Dave Airlie <airlied@linux.ie>
* [PATCH] Remove "RV370 5B60 [Radeon X300 (PCIE)]" from DRI listDave Jones2006-02-13
| | | | | | | | | | | | | | | | | I get a machine check exception, triple fault, or NMI watchdog lockup when DRI gets enabled on this card. (And Mauro Tassinari <mtassinari@cmanet.it> reports hung kernels too in http://lkml.org/lkml/2006/1/26/97) [ Adrian Bunk also states that this is the only RV350 entry for an RV370 in our lists, which implies that it's just buggy ] Cc: Adrian Bunk <bunk@stusta.de> Cc: Dave Jones <davej@redhat.com> Cc: Mauro Tassinari <mtassinari@cmanet.it> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] DRM: fix up classdev interface for drm coreGreg Kroah-Hartman2006-02-06
| | | | | | | | | Current drm code doesn't work with userspace programs that listen only to the kernel event netlink socket as it is trying to create its own dev interface. Turns out lots of code can just be deleted as the driver core can do all of this work automatically for you. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge branch 'drm-linus' of ↵Linus Torvalds2006-02-02
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * sem2mutex: drivers/char/drm/Dave Airlie2006-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Arjan van de Ven <arjan@infradead.org> Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: drivers/char/drm/: make some functions staticDave Airlie2006-02-02
| | | | | | | | | | | | | | | | | | | | From: Adrian Bunk <bunk@stusta.de> This patch makes some needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: Fixes sparse warnings in via_dmablit.cDave Airlie2006-01-25
| | | | | | | | | | | | | | | | | | | | Fixes the following sparse warnings: drivers/char/drm/via_dmablit.c:111:35: warning: Using plain integer as NULL pointer drivers/char/drm/via_dmablit.c:584:23: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: i915 patches from Tungsten GraphicsDave Airlie2006-01-24
| | | | | | | | | | | | | | | | Fix CMDBUFFER path, add heap destroy and flesh out sarea for rotation (Tungsten Graphics) From: Alan Hourihane <alanh@tungstengraphics.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: ati_pcigart: simplify page_count manipulationsDave Airlie2006-01-24
| | | | | | | | | | | | | | | | | | | | | | From: Nick Piggin <npiggin@suse.de> Allocate a compound page for the user mapping instead of tweaking the page refcounts. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: use NULL instead of 0Dave Airlie2006-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Randy Dunlap <rdunlap@xenotime.net> Use NULL instead of 0 (sparse warnings): drivers/char/drm/ati_pcigart.c:64:10: warning: Using plain integer as NULL pointer drivers/char/drm/ati_pcigart.c:130:21: warning: Using plain integer as NULL pointer drivers/char/drm/ati_pcigart.c:171:14: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: add X600 PCI IDsDave Airlie2006-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Brice Goglin <Brice.Goglin@ens-lyon.org> Now that Xorg 6.9/7.0 has been released, DRI is supported on more Radeon cards without ATI proprietary drivers. I got my X300 to work without problem. But, another Radeon X600 required to add its PCI ids to the Radeon driver. Patch is attached. I can't be sure about the "CHIP_RV350", I copied it from the X300 entry (from http://dri.freedesktop.org/wiki/ATIRadeon, X600 is a rv380 chip while X300 is a rv370). But, at least it works now. Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: add i945GM PCI IDDave Airlie2006-01-24
| | | | | | | | | | From: Charles F. Johnson <charles.f.johnson@intel.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: Fix sparce warning in radeon driverDave Airlie2006-01-24
| | | | | | | | | | | | | | | | | | | | | | From: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br> drivers/char/drm/radeon_cp.c:1643:31: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | [PATCH] Unlinline a bunch of other functionsArjan van de Ven2006-01-14
|/ | | | | | | | | | | Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'drm-forlinus' of ↵Linus Torvalds2006-01-12
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * drm: fix issues with systems with no MTRRDave Airlie2006-01-12
| | | | | | | | | | | | | | On systems with no MTRR we should still define the interface. Original bug from apkm. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: cleanup properly on drm module unloadDave Airlie2006-01-11
| | | | | | | | | | | | Cleanup multiple cards properly Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup drm bufs being just under the EOMDave Airlie2006-01-11
| | | | | | | | | | | | | | If the mapping was just under the end of memory it would fail. Lets DRM start on my PCI card. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix radeon warnings on 64-bitDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture': drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg (arg 3) sizeof() doesn't return an int. Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix warning on alphaDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> On alpha: drivers/char/drm/via_dmablit.h:44: error: field `direction' has incomplete type Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove is_pci flag completely...Dave Airlie2006-01-03
| | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: merge in Linus mainlineDave Airlie2006-01-03
| |\
| * | drm: major update from CVS for radeon and coreDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | This patch pull in a lot of changes from CVS to the main core DRM, and updates the radeon driver to 1.21.0 that supports r300 texrect and radeon card type ioctl. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update drm pci ids listDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | Apply the fixes from CVS that were outstanding for this file Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update lock flags from userspaceDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update to i915 1.3.0Dave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update drm_memory_debug.hDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | Update from DRM CVS for drm memory debug From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: proper fix for drm_contextDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix issue with contexts running out of RAMDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update PCIGART support from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | In order to work on FreeBSD the gart needed to use a local mapping This patch moves the mainline to the new code and aligns some comment changes From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-02
| | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: bring savage inline with latest CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | apply some whitespace cleanup and add wrappers for MTRR for OS calls From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix a LOR issue on FreeBSD for savage driverDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a LOR issue on FreeBSD by allocating temporary space and doing a single DRM_COPY_FROM_USER rather than DRM_VERIFYAREA_READ followed by tons of DRM_COPY_FROM_USER_UNCHECKED. I don't like the look of the temporary space allocation, but I like the simplification in the rest of the file. Tested with glxgears, tuxracer, and q3 on a savage4. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: bring sis + tdfx up to latest CVSDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | Cleanup SIS + TDFX drivers with latest changes from CVS. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: via driver update to CVS versionDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the DRM via driver to the latest CVS version, which contains support for DMA blitting. It also contains some whitespace and other minor fixes From: Thomas Hellstrom <unichrome@shipmail.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: move ioctl flags to a bit field of flagsDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | From: Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update VIA driver to 2.7.2Dave Airlie2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add PCI DMA blitengine to VIA DRM Add portability code for porting VIA to FreeBSD. Sync via_drm.h with 3d driver From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: drop mtrr from i915Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | Alan Hourihane wants to set MTRR in the DDX only as otherwise we get problems with the shared memory chipset. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update mga driver for new bootstrap codeDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | The MGA driver needs to use the full AGP interface. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove exports that modules shouldn't use.Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | Modules should go via the new drm_agp_ functions. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: add in-kernel entry points for rest of AGP ioctlsDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | Allow DRM modules to call AGP internally in the kernel. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: simplify sysfs code for drmDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the sysfs code for the drm and add a dri_library_name attribute which can be used by a userspace app to figure out which library to load. From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup drm_proc.c struct tableDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove old backwards compatibilty stuffDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove drm_flushDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | drm_flush is no longer needed remove. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: cleanup via_ds.c includesDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | Remove the linux includes from via_ds.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove remnamt of old DRM code from tdfxDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>