summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* drm: remove old taskqueue remnantDave Airlie2007-05-081-3/+0
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: rename badly named define and cleanup ioctl code spacingDave Airlie2007-05-081-6/+4
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* radeon: Don't mess up page flipping when a file descriptor is closed.Michel Dänzer2007-05-082-28/+19
| | | | | | | | | There can still be other contexts that may use page flipping later on, so do just unilaterally 'clean it up', which could lead to the wrong page being displayed, e.g. when running 3D apps with a GLX compositing manager such as compiz using page flipping. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/radeon: upgrade to 1.27 - make PCI GART more flexibleDave Airlie2007-05-089-48/+150
| | | | | | | | | | | | | | | | | | radeon: make PCI GART aperture size variable, but making table size variable This is precursor to getting a TTM backend for this stuff, and also allows the PCI table to be allocated at fb 0 radeon: add support for reverse engineered xpress200m The IGPGART setup code was traced using mmio-trace on fglrx by myself and Phillip Ezolt <phillipezolt@gmail.com> on dri-devel. This code doesn't let the 3D driver work properly as the card has no vertex shader support. Thanks to Matthew Garrett + Ubuntu for providing me some hardware to do this work on. Signed-off-by: Dave Airlie <airlied@linux.ie>
* Merge branch 'drm-patches' of ↵Linus Torvalds2007-05-0720-196/+349
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Add 965GM pci id update drm: just use io_remap_pfn_range on all archs.. drm: fix DRM_CONSISTENT mapping drm: fix up mmap locking in preparation for ttm changes drm: fix driver deadlock with AIGLX and reclaim_buffers_locked drm: fix warning in drm_fops.c drm: allow for more generic drm ioctls drm: fix alpha domain handling via: fix CX700 pci id drm: make drm_io_prot static. drm: remove via_mm.h drm: add missing NULL assignment drm/radeon: Fix u32 overflows when determining AGP base address in card space. drm: port over use_vmalloc code from git hashtab drm: fix crash with fops lock and fixup sarea/page size locking drm: bring bufs code from git tree. drm: move protection stuff into separate function drm: Use ARRAY_SIZE macro when appropriate drm: update README.drm (bugzilla #7933) drm: remove unused exports
| * drm/i915: Add 965GM pci id updateWang Zhenyu2007-04-262-1/+3
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: just use io_remap_pfn_range on all archs..Dave Airlie2007-03-241-6/+1
| | | | | | | | | | | | Move the sparc64 ifdef around to clean this up. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix DRM_CONSISTENT mappingHugh Dickins2007-03-241-5/+9
| | | | | | | | | | | | This patch got lost in the DRM git tree for ages, bring it back to life. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix up mmap locking in preparation for ttm changesThomas Hellstrom2007-03-241-9/+26
| | | | | | | | | | | | | | This change is needed to protect againt disappearing maps which aren't common. The map lists are protected using sturct_mutex but drm_mmap never locked it. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix driver deadlock with AIGLX and reclaim_buffers_lockedThomas Hellstrom2007-03-237-81/+174
| | | | | | | | | | | | | | | | | | | | | | | | Bugzilla Bug #9457 Add refcounting of user waiters to the DRM hardware lock, so that we can use DRM_LOCK_CONT flag more conservatively. Also add a kernel waiter refcount that if nonzero transfers the lock for the kernel context when it is released. This is useful when waiting for idle and can be used for very simple fence object driver implementations for the new memory manager Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix warning in drm_fops.cAndrew Morton2007-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | drivers/char/drm/drm_fops.c: In function 'drm_setup': drivers/char/drm/drm_fops.c:60: warning: comparison of distinct pointer types lacks a cast Unfortunately PAGE_SIZE has different types on different architectures. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: allow for more generic drm ioctlsThomas Hellstrom2007-03-192-4/+9
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix alpha domain handlingJay Estabrook2007-03-111-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * via: fix CX700 pci idThomas Hellstrom2007-03-111-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: make drm_io_prot static.Adrian Bunk2007-03-111-1/+1
| | | | | | | | | | | | | | This patch makes the needlessly global drm_io_prot() static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
OpenPOWER on IntegriCloud