summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAgeFilesLines
* video gfx: merge kconfig menusRandy Dunlap2007-10-161-1/+1
| | | | | | | | | | | | | | | | Move AGP and DRM menus into the video graphics support menu. They use 'menuconfig' so that they can all be disabled with one selection. Make the console menu use 'menuconfig' so that it can all be disabled with one selection. Make the frame buffer menu use 'menuconfig' so that it can all be disabled with one selection. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* radeon_driver_vblank_do_wait() staticAdrian Bunk2007-10-161-2/+2
| | | | | | | | radeon_driver_vblank_do_wait() can become static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* via invalid device ids removalXavier Bachelot2007-10-151-2/+0
| | | | | | | | | 0x1106, 0x7204 is unknown and thus is not an IGP/GPU. 0x1106, 0x3304 is K8M800 hostbridge, not an IGP/GPU. None of them are in drm git tree. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* radeon: Commit the ring after each partial texture upload blit.chaohong guo2007-10-151-1/+3
| | | | | | | This makes sure each blit starts as early as possible, which may improve texture upload performance in some cases. Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: fix vbl swap allocation size.Dave Airlie2007-10-151-1/+1
| | | | | | Oops... Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.Eric Anholt2007-10-1545-2146/+1489
| | | | | | | | | The data is now in kernel space, copied in/out as appropriate according to t This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal with those failures. This also means that XFree86 4.2.0 support for i810 DR is lost. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove XFREE86_VERSION macros.Dave Airlie2007-10-153-42/+1
| | | | | | These are no longer needed or being used. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Replace filp in ioctl arguments with drm_file *file_priv.Eric Anholt2007-10-1543-661/+603
| | | | | | | | | | As a fallout, replace filp storage with file_priv storage for "unique identifier of a client" all over the DRM. There is a 1:1 mapping, so this should be a noop. This could be a minor performance improvement, as everyth on Linux dereferenced filp to get file_priv anyway, while only the mmap ioct went the other direction. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Remove DRM_ERR OS macro.Eric Anholt2007-10-1531-475/+474
| | | | | | | | This was used to make all ioctl handlers return -errno on linux and errno on *BSD. Instead, just return -errno in shared code, and flip sign on return f shared code to *BSD code. Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: make vbl interrupts work properly on i965g/gm hw.Dave Airlie2007-09-272-0/+18
| | | | | | | | | | | | This code is ported from the DRM git tree and allows the vblank interrupts to function on the i965 hw. It also requires a change in Mesa's 965 driver to actually use them. [ Without this patch, my 965GM drops vblank interrupts - Jesse ] Signed-off-by: Dave Airlie <airlied@linux.ie> Acked-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'drm-patches' of ↵Linus Torvalds2007-08-252-7/+8
|\ | | | | | | | | | | | | | | | | 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: ioremap return value checks drm/via: Fix dmablit when blit queue is full drm_rmmap_ioctl(): remove dead code
| * drm: ioremap return value checksScott Thompson2007-08-251-1/+7
| | | | | | | | | | Signed-off-by: Scott Thompson <postfail <at> hushmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm/via: Fix dmablit when blit queue is fullSimon Farnsworth2007-07-231-1/+1
| | | | | | | | | | | | | | fd.o bug 11542 Acked-by: Thomas Hellstrom Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm_rmmap_ioctl(): remove dead codeAdrian Bunk2007-07-231-5/+0
| | | | | | | | | | | | | | | | This patch removes some obviously dead code spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm/i915: Fix i965 secured batchbuffer usageDave Airlie2007-08-062-3/+12
|/ | | | | | | | | | This 965G and above chipsets moved the batch buffer non-secure bits to another place. This means that previous drm's allowed in-secure batchbuffers to be submitted to the hardware from non-privileged users who are logged into X and and have access to direct rendering. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* some kmalloc/memset ->kzalloc (tree wide)Yoann Padioleau2007-07-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [akpm@linux-foundation.org: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@analog.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Dave Airlie <airlied@linux.ie> Acked-by: Roland Dreier <rolandd@cisco.com> Cc: Jiri Kosina <jkosina@suse.cz> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-by: Pierre Ossman <drzeus-list@drzeus.cx> Cc: Jeff Garzik <jeff@garzik.org> Cc: "David S. Miller" <davem@davemloft.net> Acked-by: Greg KH <greg@kroah.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: add idr_init to drm_stub.cDave Airlie2007-07-171-0/+2
| | | | | | Brown paper bag for me this patch chunk didn't make it in the first application Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fix problem with SiS typedef with sisfb enabled.Dave Airlie2007-07-171-1/+1
| | | | | | Reported by: Avuton Olrich <avuton@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: convert drawable code to using idrDave Airlie2007-07-173-209/+60
| | | | | | | | This converts the code for allocating drawables to the Linux idr, Fixes from: Michel Dänzer <michel@tungstengraphics.com>, Kristian Høgsberg <krh@redhat.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: convert drm context code to use Linux idrDave Airlie2007-07-172-103/+33
| | | | | | | | | This converts the drm context allocator to an idr, using the new idr interface features from Kristian. Fixes from Kristian Hoegsberg <krh@redhat.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove core typedefs from the ioc32 wrappersDave Airlie2007-07-161-41/+41
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove sarea typedefsDave Airlie2007-07-122-9/+15
| | | | | | Leave the userspace typedefs in place Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: detypedef the hashtab and more of smanDave Airlie2007-07-128-59/+59
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: de-typedef smanDave Airlie2007-07-126-49/+51
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: detypedeffing continues...Dave Airlie2007-07-1123-142/+143
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structsDave Airlie2007-07-1116-80/+81
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: drop drm_vma_entry_t, drm_magic_entry_tDave Airlie2007-07-115-19/+15
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: drop drm_buf_t typedefDave Airlie2007-07-1120-104/+104
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup other drivers for typedef removalsDave Airlie2007-07-1122-296/+296
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove drm_file_t, drm_device_t and drm_head_t typedefsDave Airlie2007-07-1142-432/+432
| | | | | | some drivers still todo. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove a bunch of typedefs on the userspace interfaceDave Airlie2007-07-1125-320/+367
| | | | | | | This moves a bunch of typedefs into a !defined __KERNEL__ to keep userspace API compatiblity, it changes all internal usages to structs/enum/unions. Signed-off-by: Dave Airlie <airlied@linux.ie>
* r300: updates register headerOliver McFadden2007-07-112-506/+698
| | | | | | | This updates the R300 register names and allows the VAP_PVS_WAITIDLE register to be written. Signed-off-by: Dave Airlie <airlied@linux.ie>
* radeon: add support for vblank on crtc2Dave Airlie2007-07-116-14/+124
| | | | | | This adds support for CRTC2 vblank on radeon similiar to the i915. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: cleanup list initialisationDave Airlie2007-07-112-5/+4
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fix typo on code drm getsareaDave Airlie2007-07-111-1/+1
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove DRM_GETSAREA and replace with drm_getsarea functionDave Airlie2007-07-119-26/+22
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: cleanup use of Linux list handling macrosDave Airlie2007-07-1118-195/+116
| | | | | | | | This makes the drms use of the list handling macros a lot cleaner and more along the lines of how they should be used and uses them in some more places. Signed-off-by: Dave Airlie <airlied@linux.ie>
* Add support SiS based XGI chips to SiS DRM.Ian Romanick2007-06-272-4/+6
| | | | | | | | This adds support for some of the XGI Volari family that are based on the SiS. Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* fix radeon setparam on 32/64 systems, harder.David Woodhouse2007-06-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | Commit 9b01bd5b284bbf519b726b39f1352023cb5e9e69 introduced a compat_ioctl handler for RADEON_SETPARAM, the sole purpose of which was to handle the fact that on i386, alignof(uint64_t)==4. Unfortunately, this handler was installed for _all_ 64-bit architectures, instead of only x86_64 and ia64. And thus it breaks 32-bit compatibility on every other arch, where 64-bit integers are aligned to 8 bytes in 32-bit mode just the same as in 64-bit mode. Arnd has a cunning plan to use 'compat_u64' with appropriate alignment attributes according to the 32-bit ABI, but for now let's just make the compat_radeon_cp_setparam routine entirely disappear on 64-bit machines whose 32-bit compat support isn't for i386. It would be a no-op with compat_u64 anyway. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Dave Airlie <airlied@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: fix radeon setparam on 32/64 bit systems.Dave Airlie2007-06-101-0/+26
| | | | | | The alignment on 64-bit is different for 64-bit values. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/i915: Add support for the G33, Q33, and Q35 chipsets.Wang Zhenyu2007-06-104-17/+80
| | | | | | | | These require that the status page be referenced by a pointer in GTT, rather than phsyical memory. So, we have the X Server allocate that memory and tell us the address, instead. Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: add new pciids for 945GME, 965GME/GLEWang Zhenyu2007-06-102-1/+4
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* Merge branch 'drm-patches' of ↵Linus Torvalds2007-05-313-16/+34
|\ | | | | | | | | | | | | | | | | ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: make sure the drawable code doesn't call malloc(0). drm/radeon: add more IGP chipset pci ids drm: Spinlock initializer cleanup
| * drm: make sure the drawable code doesn't call malloc(0).Michel Dänzer2007-05-261-15/+26
| | | | | | | | | | Signed-off-by: Michel Dänzer <michel@tungstengraphics.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm/radeon: add more IGP chipset pci idsDave Airlie2007-05-261-0/+7
| | | | | | | | | | | | Add more IGP chipset PCI IDs Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: Spinlock initializer cleanupThomas Gleixner2007-05-261-1/+1
| | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.Martin Habets2007-05-291-1/+1
|/ | | | | | | | | The DRM code depends on an atomic version of cmpxchg(), which is not available on sparc32. Since other platforms besides sparc32 have this issue a KCONFIG option is added for it. Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* Fix occurrences of "the the "Michael Opdenacker2007-05-093-3/+3
| | | | | Signed-off-by: Michael Opdenacker <michael@free-electrons.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* via: Make sure we flush write-combining using a follow-up read.Thomas Hellstrom2007-05-081-2/+4
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* via: Try to improve command-buffer chaining.Thomas Hellstrom2007-05-082-66/+46
| | | | | | Bump driver date and patchlevel. Signed-off-by: Dave Airlie <airlied@linux.ie>
OpenPOWER on IntegriCloud