summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAgeFilesLines
* remove debug printk from DRM suspend pathJesse Barnes2008-05-231-2/+0
| | | | | | | | | Not sure how this snuck upstream, but it really doesn't belong there. We don't need a KERN_ERR printk in the suspend path to know what's going on (at least not anymore). Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm/i915: save and restore dsparb and d_state registers.Keith Packard2008-05-072-0/+17
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915: fix off by one in VGA save/restore of AR & CR regs.Jesse Barnes2008-05-072-6/+6
| | | | | | turns out it's important to save/restore AR14 in particular. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: disable tasklets not IRQs when taking the drm lock spinlockThomas Hellstrom2008-05-072-25/+17
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* Revert "drm/vbl rework: rework how the drm deals with vblank."Dave Airlie2008-05-0720-1372/+473
| | | | | | | | | | This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4. Okay this looks like wasn't as fully baked as I'd led myself to believe. Revert for now for further baking. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drivers/char: replace remaining __FUNCTION__ occurrencesHarvey Harrison2008-04-308-23/+23
| | | | | | | | __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drivers: atm, char fix integer as NULL pointer warningsHarvey Harrison2008-04-281-1/+1
| | | | | | | | | drivers/atm/nicstar.c:418:25: warning: Using plain integer as NULL pointer drivers/char/drm/r128_cce.c:820:25: warning: Using plain integer as NULL pointer drivers/char/tty_io.c:1183:10: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: _end is shadowing real _end, just rename it.Dave Airlie2008-04-261-2/+2
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/vbl rework: rework how the drm deals with vblank.Jesse Barnes2008-04-2620-473/+1372
| | | | | | | | | | | | | Other Authors: Michel Dänzer <michel@tungstengraphics.com> mga: Ian Romanick <idr@us.ibm.com> via: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> This re-works the DRM internals to provide a better interface for drivers to expose vblank on multiple crtcs. It also includes work done by Michel on making i915 triple buffering and pageflipping work properly. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: reorganise minor number handling using backported modesetting code.Dave Airlie2008-04-2610-184/+230
| | | | | | rips out the head crap and replaces it with an idr and drm_minor structure Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915: Handle tiled buffers in vblank taskletKeith Packard2008-04-262-4/+16
| | | | | | | The vblank tasklet update code must build 2D blt commands with the appropriate tiled flags Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i965: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblankKeith Packard2008-04-261-10/+20
| | | | | | | | The batchbuffer submission paths were fixed to use the 965-specific command, but the vblank tasklet was not. When the older version is sent, the 965 will lock up. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Remove unneeded dma sync in ATI pcigart allocBenjamin Herrenschmidt2008-04-261-7/+0
| | | | | | | | Now that the ATI pcigart code uses dma_alloc_coherent, we don't need the dma_sync_single_for_device() that we used to have here. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Fix mismerge of non-coherent DMA patchBenjamin Herrenschmidt2008-04-261-1/+1
| | | | | | | | | The patch for supporting non coherent PCI DMA in the DRM was mismerged causing the page protection to be updated for the wrong type of mapping. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* DRM: remove unused dev_classGreg Kroah-Hartman2008-04-191-1/+0
| | | | | | | | | | | | | The struct class_device *dev_class is not used in the struct drm_head structure at all, so remove it as class_device is being removed entirely from the kernel. Cc: David Airlie <airlied@linux.ie> Cc: Tony Jones <tonyj@suse.de> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* fix IS_I9XX macro in i915 DRM driverJesse Barnes2008-04-061-2/+2
| | | | | | | | | | | | | | Now that we're mapping registers in the DRM driver at load time, the driver actually checks the PCI ID, so we need to make sure the macros have all the right bits (and longer term use the DRM headers as the sole copy of the PCI & register definitions). This patch adds 945GME support to the DRM headers, fixing a regression reported in http://bugzilla.kernel.org/show_bug.cgi?id=10395. Tested-by: Alexander Oltu <alexander@all-2.com> Signed-off-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: fix for non-coherent DMA PowerPCBenjamin Herrenschmidt2008-03-303-6/+31
| | | | | | | | | | | | | | | | 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> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon: fix sparse integer as NULL pointer warnings in radeon_mem.cHarvey Harrison2008-03-301-4/+4
| | | | | | | | | | | | drivers/char/drm/radeon_mem.c:91:23: warning: Using plain integer as NULL pointer drivers/char/drm/radeon_mem.c:116:28: warning: Using plain integer as NULL pointer drivers/char/drm/radeon_mem.c:124:28: warning: Using plain integer as NULL pointer drivers/char/drm/radeon_mem.c:177:26: warning: Using plain integer as NULL pointer drivers/char/drm/radeon_mem.c:177:53: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/i915: fix oops on agp=offDave Airlie2008-03-301-0/+3
| | | | | | | From Kernel BZ 10289 - not sure why anyone would boot an intel with no agp but it shouldn't crash. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/r300: fix bug in r300 userspace hardware wait emissionDave Airlie2008-03-302-12/+54
| | | | | | | | | | | This interface was originally designed wrong, confusing bit-fields and integers, major brown paper bag going back many years... But userspace only ever used 4 values so fix the interface for new users and fix the implementation to deal with the 4 values userspace has ever emitted (0x1, 0x2, 0x3, 0x6). Signed-off-by: Dave Airlie <airlied@redhat.com>
* drivers/char/drm/ati_pcigart.c: fix printk warningAndrew Morton2008-03-281-2/+3
| | | | | | | | | | drivers/char/drm/ati_pcigart.c: In function 'drm_ati_pcigart_init': drivers/char/drm/ati_pcigart.c:125: warning: format '%08X' expects type 'unsigned int', but argument 3 has type 'dma_addr_t' Cc: Dave Airlie <airlied@linux.ie> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table.Dave Airlie2008-03-174-69/+27
| | | | | | | This fixes a problem on 64-bit with 4GB with ATI RS690 chipsets. It makes sure the pcigart table is allocated in coherent memory for DMA operations. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon: fixup RV550 chip familyAlex Deucher2008-03-171-3/+4
| | | | | | | This fixes up the RV550 chips which are based on RV515, not RV530. It also adds another RS690 PCI ID. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/via: attempt again to stabilise the AGP DMA command submission.Thomas Hellstrom2008-03-172-7/+54
| | | | | | | | | It's worth remembering that all new bright ideas on how to make this command reader work properly and according to docs will probably fail :( Bring in some old code. Also allow a larger SG-DMA download stride, and remove unnecessary waits for command regulators pauses. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Fix race that can lockup the kernelMike Isely2008-03-172-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i915_vblank_swap() function schedules an automatic buffer swap upon receipt of the vertical sync interrupt. Such an operation is lengthy so it can't be allowed to happen in normal interrupt context, thus the DRM implements this by scheduling the work in a kernel softirq-scheduled tasklet. In order for the buffer swap to work safely, the DRM's central lock must be taken, via a call to drm_lock_take() located in drivers/char/drm/drm_irq.c within the function drm_locked_tasklet_func(). The lock-taking logic uses a non-interrupt-blocking spinlock to implement the manipulations needed to take the lock. This semantic would be safe if all attempts to use the spinlock only happen from process context. However this buffer swap happens from softirq context which is really a form of interrupt context. Thus we have an unsafe situation, in that drm_locked_tasklet_func() can block on a spinlock already taken by a thread in process context which will never get scheduled again because of the blocked softirq tasklet. This wedges the kernel hard. To trigger this bug, run a dual-head cloned mode configuration which uses the i915 drm, then execute an opengl application which synchronizes buffer swaps against the vertical sync interrupt. In my testing, a lockup always results after running anywhere from 5 minutes to an hour and a half. I believe dual-head is needed to really trigger the problem because then the vertical sync interrupt handling is no longer predictable (due to being interrupt-sourced from two different heads running at different speeds). This raises the probability of the tasklet trying to run while the userspace DRI is doing things to the GPU (and manipulating the DRM lock). The fix is to change the relevant spinlock semantics to be the interrupt-blocking form. After this change I am no longer able to trigger the lockup; the longest test run so far was 20 hours (test stopped after that point). Note: I have examined the places where this spinlock is being employed; all are reasonably short bounded sequences and should be suitable for interrupts being blocked without impacting overall kernel interrupt response latency. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: fix AR register restore.Jesse Barnes2008-02-221-0/+1
| | | | | | | | | | Make sure the restoration correctly restores the AR registers by flipping the ARX register into index mode before doing anything. Without this, some people have had the text mode restore all green. Signed-off-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm/sis: add pciid for SiS 662/671 chipsetChaoyu Chen2008-02-201-0/+1
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: add new rv380 pciidMirko2008-02-201-0/+1
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: add support for passing state into the suspend hooks.Dave Airlie2008-02-203-6/+11
| | | | | | fix i915 driver to use state for hibernate save avoidance. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915: Fix hibernate save/restore of VGA attribute regsJesse Barnes2008-02-201-0/+2
| | | | | | In hibernate, we may end up calling the VGA save regs function twice, so we need to make sure it's idempotent. That means leaving ARX in index mode after the first save operation. Fixes hibernate on 965. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915 more registers for S3 (DSPCLK_GATE_D, CACHE_MODE_0, MI_ARB_STATE)Keith Packard2008-02-202-0/+28
| | | | | | | Failing to preserve the MI_ARB_STATE register was causing FIFO underruns on the VGA output on my HP 2510p after resume. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915: restore pipeconf regs unconditionallyJesse Barnes2008-02-201-7/+4
| | | | | | On many chipsets, the checks for DPLL enable or VGA mode will prevent the pipeconf regs from being restored, which could result in a blank display or X failing to come back after resume. So restore them unconditionally along with actually restoring pipe B's palette correctly. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/i915: save/restore interrupt stateJesse Barnes2008-02-202-0/+12
| | | | | | | | | On resume, if the interrupt state isn't restored correctly, we may end up with a flood of unexpected or ill-timed interrupts, which could cause the kernel to disable the interrupt or vblank events to happen at the wrong time. So save/restore them properly. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: convert drm from nopage to fault.Nick Piggin2008-02-201-70/+55
| | | | | | | | Remove redundant vma range checks. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: wrap chipset types requiring hw status set ioctlZhenyu Wang2008-02-202-1/+6
| | | | | | | Also applys to recent added new chipset. Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/radeon: add initial rs690 support to drm.Maciej Cencora2008-02-203-0/+120
| | | | | | This adds support for configuring the RS690 GART. Signed-off-by: Dave Airlie <airlied@redhat.com>
* Final removal of FASTCALL()/fastcallHarvey Harrison2008-02-131-1/+1
| | | | | | | | | | All users are gone, remove definitions and comments referring to them. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* i915: Fix GR register array size off-by-one bugJesse Barnes2008-02-071-1/+1
| | | | | | | | | | Make sure we have enough room for all the GR registers or we'll end up clobbering the AR index register (which should actually be harmless unless the BIOS is making an assumption about it). Noticed-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: add initial r500 drm supportDave Airlie2008-02-076-59/+240
| | | | | | | This adds CP support for the r500 series of chips, and allows accel 2D support on these chips with a new radeon driver. Signed-off-by: Dave Airlie <airlied@redhat.com>
* radeon: setup the ring buffer fetcher to be less agressive.Roland Scheidegger2008-02-072-3/+62
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup some of the ioctl function exit pathsDave Airlie2008-02-071-5/+7
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: the drm really should call pci_set_master..Dave Airlie2008-02-071-0/+1
| | | | | | | perhaps bonghits could turn on my bus-mastering because the drm certainly never bothered doing it before. Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: Add chipset id for Intel Integrated Graphics DeviceZhenyu Wang2008-02-073-3/+7
| | | | | | | This adds new chipset id in drm. Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: cleanup DRM_DEBUG() parametersMárton Németh2008-02-0728-145/+122
| | | | | | | | | | As DRM_DEBUG macro already prints out the __FUNCTION__ string (see drivers/char/drm/drmP.h), it is not worth doing this again. At some other places the ending "\n" was added. airlied:- I cleaned up a few that this patch missed also Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/i915: add support for E7221 chipsetCarlos Martín2008-02-071-1/+1
| | | | | | E7221 chipset is a server version of the i915. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: don't cast a pointer to pointer of list_headLi Zefan2008-02-071-1/+1
| | | | | | | | | The casting is safe only when the list_head member is the first member of the structure. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* mga_dma: return 'err' not just zero from mga_do_cleanup_dma()Jesper Juhl2008-02-071-1/+1
| | | | | | | | | | | | | | | | | | While reading some code I stumbled across the use of 'err' in drivers/char/drm/mga_dma.c::mga_do_cleanup_dma() and I think there's a small problem. The variable is only used inside #if __OS_HAS_AGP which is fine, but all that ever happens is an assignment to the variable - it is never actually used for anything. The variable is nicely initialized to zero which is also what the return statement at the end of function returns (always at the moment). It looks to me like that function should be returning 'err' instead of always just returning 0. Here's a patch to do that. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: add _DRM_DRIVER flag, and re-order unload.Dave Airlie2008-02-073-8/+11
| | | | | | | | Allow drivers to addmaps that won't be removed by lastclose or unload. The unload needs to be re-ordered to avoid removing the hashs before the driver has removed the final maps. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: enable udev node creationDave Airlie2008-02-071-6/+1
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx.Eric Anholt2008-02-071-14/+11
| | | | | | Fixes the getclient test and dritest -c. Signed-off-by: Dave Airlie <airlied@linux.ie>
OpenPOWER on IntegriCloud