summaryrefslogtreecommitdiff
path: root/drivers/char/drm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'drm-patches' of ↵Linus Torvalds2006-03-3016-318/+413
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: remove drm_{alloc,free}_pages drm: sis fix compile warning drm: add new radeon PCI ids.. drm: read breadcrumb in IRQ handler drm: fixup i915 breadcrumb read/write drm: remove pointless checks in radeon_state drm: fixup improper cast. drm: rationalise some pci ids drm: Add general-purpose packet for manipulating scratch registers (r300) drm: rework radeon memory map (radeon 1.23) drm: update r300 register names drm: fixup PCI DMA support
| * drm: remove drm_{alloc,free}_pagesDave Airlie2006-03-293-131/+0
| | | | | | | | | | | | | | | | drm_alloc_pages and drm_free_pages can now be removed. 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: sis fix compile warningDave Airlie2006-03-291-1/+1
| | | | | | | | | | | | | | | | | | Prevent a gcc warning in the SIS DRM driver. offset is a unsigned int and the printk wants a long. Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: add new radeon PCI ids..Dave Airlie2006-03-253-27/+81
| | | | | | | | | | | | | | | | This adds all the r300 and r400 PCI ids from DRM CVS, it also makes these cards only initialise when the new xorg driver is used, as otherwise the DRM can cause lockups. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: read breadcrumb in IRQ handlerDave Airlie2006-03-201-0/+2
| | | | | | | | | | From: Keith Whitwell <keithw@tungstengraphics.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup i915 breadcrumb read/writeDave Airlie2006-03-191-2/+0
| | | | | | | | | | | | Some minor issues in the i915 breadcrumb code. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove pointless checks in radeon_stateDave Airlie2006-03-191-45/+0
| | | | | | | | | | | | | | | | | | | | | | If these were valid checks, we'd have already oopsed several lines above where we were already dereferencing them. DA: these used to be valid but other changes made them unnecessary. Coverity: 776,777,778 Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup improper cast.Dave Airlie2006-03-191-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: rationalise some pci idsDave Airlie2006-03-192-16/+14
| | | | | | | | | | | | | | | | | | This is the start of some work from Roland Scheidegger to align the X DDX pci ids and the drm ones, however we don't want to put r300 ids in the kernel just yet, they destabilise a few machines. From: Roland Scheidegger (via DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: Add general-purpose packet for manipulating scratch registers (r300)Dave Airlie2006-03-193-1/+75
| | | | | | | | | | From: Aapo Tahkola (via DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: rework radeon memory map (radeon 1.23)Dave Airlie2006-03-195-64/+163
| | | | | | | | | | | | | | | | | | | | This code reworks the radeon memory map so it works better for newer r300 chips and for a lot of older PCI chips. It really requires a new X driver in order to take advantage of this code. From: Ben Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: update r300 register namesDave Airlie2006-03-192-9/+34
| | | | | | | | | | | | Update some of the DRM register names from DRM CVS Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup PCI DMA supportDave Airlie2006-03-194-23/+44
| | | | | | | | | | | | | | This patch makes the PCI support use the correct Linux interfaces finally. Tested in DRM CVS on PCI MGA card. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | [PATCH] mark f_ops const in the inodeArjan van de Ven2006-03-283-3/+3
| | | | | | | | | | | | | | | | | | | | | | Mark the f_ops members of inodes as const, as well as fix the ripple-through this causes by places that copy this f_ops and then "do stuff" with it. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [SPARC]: Respect vm_page_prot in io_remap_page_range().David S. Miller2006-03-221-0/+1
| | | | | | | | | | | | | | | | | | Make sure the callers do a pgprot_noncached() on vma->vm_page_prot. Pointed out by Hugh Dickens. Signed-off-by: David S. Miller <davem@davemloft.net>
* | remove dead Radeon URLAdrian Bunk2006-03-201-2/+2
|/ | | | | | | | | This patch removes a dead Radeon URL from two Kconfig files. This isue was noted by Reto Gantenbein <ganto82@gmx.ch> in Kernel Bugzilla #4446. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* drm: fix brace placementDave Airlie2006-02-181-4/+2
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon add r300 TX_CNTL and verify bitblt packetsDave Airlie2006-02-183-1/+55
| | | | | | | 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-181-0/+5
| | | | | | 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-131-1/+0
| | | | | | | | | | | | | | | | | 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-063-108/+35
| | | | | | | | | 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-0228-175/+248
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * sem2mutex: drivers/char/drm/Dave Airlie2006-02-0211-125/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0210-23/+12
| | | | | | | | | | | | | | | | | | | | 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-261-2/+2
| | | | | | | | | | | | | | | | | | | | 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-254-14/+98
| | | | | | | | | | | | | | | | 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-251-7/+4
| | | | | | | | | | | | | | | | | | | | | | 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-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
| | | | | | | | | | 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-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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-141-1/+1
|/ | | | | | | | | | | 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-1273-1812/+2794
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * drm: fix issues with systems with no MTRRDave Airlie2006-01-121-0/+14
| | | | | | | | | | | | | | 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-111-6/+6
| | | | | | | | | | | | Cleanup multiple cards properly Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup drm bufs being just under the EOMDave Airlie2006-01-111-1/+1
| | | | | | | | | | | | | | 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-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+0
| | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: merge in Linus mainlineDave Airlie2006-01-035-7/+11
| |\
| * | drm: major update from CVS for radeon and coreDave Airlie2006-01-0212-381/+366
| | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-021-5/+10
| | | | | | | | | | | | | | | | | | 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-021-2/+2
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update to i915 1.3.0Dave Airlie2006-01-026-39/+78
| | | | | | | | | | | | | | | | | | | | | 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-021-135/+134
| | | | | | | | | | | | | | | | | | | | | 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-021-2/+1
| | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix issue with contexts running out of RAMDave Airlie2006-01-021-0/+4
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update PCIGART support from CVSDave Airlie2006-01-028-38/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-2/+0
| | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
View Lorry Controller Status