aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAge
...
* drm/sis: add pciid for SiS 662/671 chipsetChaoyu Chen2008-02-19
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: add new rv380 pciidMirko2008-02-19
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: add support for passing state into the suspend hooks.Dave Airlie2008-02-19
| | | | | | 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-19
| | | | | | 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-19
| | | | | | | 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-19
| | | | | | 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-19
| | | | | | | | | 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-19
| | | | | | | | 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-19
| | | | | | | 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-19
| | | | | | This adds support for configuring the RS690 GART. Signed-off-by: Dave Airlie <airlied@redhat.com>
* Final removal of FASTCALL()/fastcallHarvey Harrison2008-02-13
| | | | | | | | | | 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-07
| | | | | | | | | | 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-07
| | | | | | | 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-07
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup some of the ioctl function exit pathsDave Airlie2008-02-07
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: the drm really should call pci_set_master..Dave Airlie2008-02-07
| | | | | | | 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-07
| | | | | | | 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-07
| | | | | | | | | | 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-07
| | | | | | 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-07
| | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | 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-07
| | | | 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-07
| | | | | | Fixes the getclient test and dritest -c. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: move drm_mem_init to proper place in startup sequenceDave Airlie2008-02-07
| | | | | | For TTM this needs to be called later. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: call driver load function after initialising AGPDave Airlie2008-02-07
| | | | | | needed to intel chipset flushing Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Fix ioc32 compat layerIan Romanick2008-02-07
| | | | | | | | | Previously any ioctls that weren't explicitly listed in the compat ioctl table would fail with ENOTTY. If the incoming ioctl number is outside the range of the table, assume that it Just Works, and pass it off to drm_ioctl. This make the fence related ioctls work on 64-bit PowerPC. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fd.o bug #11895: Only add the AGP base to map offset if the caller didn't.Eric Anholt2008-02-07
| | | | | | | | | The i830 and newer intel 2D code adds the AGP base to map offsets already, because it wasn't doing the AGP enable which used to set dev->agp->base. Credit goes to Zhenyu for finding the issue. Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: add suspend/resume supportJesse Barnes2008-02-07
| | | | | | | | | Add suspend/resume support to the i915 driver. Moves some of the initialization into the driver load routine, and fixes up places where we assumed no dev_private existed in some of the cleanup paths. This allows us to suspend/resume properly even if X isn't running. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: update DRM sysfs supportJesse Barnes2008-02-07
| | | | | | | | | Make DRM devices use real Linux devices instead of class devices, which are going away. While we're at it, clean up some of the interfaces to take struct drm_device * or struct device * and use the global drm_class where needed instead of passing it around. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Initialize the AGP structure's base address at init rather than enable.Eric Anholt2008-02-07
| | | | | | | Not all drivers call enable (intel), but they would still like to use this member in driver code. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: move two function extern into the correct blockDave Airlie2008-02-07
|
* drm: run cleanfile across drm treeDave Airlie2008-02-07
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: some minor cleanups and changes to make memory manager merging easier.Dave Airlie2008-02-07
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2008-02-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
| * drivers/char/: Spelling fixesJoe Perches2008-02-03
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
* | vm audit: add VM_DONTEXPAND to mmap for drivers that need itNick Piggin2008-02-04
|/ | | | | | | | | | | | Drivers that register a ->fault handler, but do not range-check the offset argument, must set VM_DONTEXPAND in the vm_flags in order to prevent an expanding mremap from overflowing the resource. I've audited the tree and attempted to fix these problems (usually by adding VM_DONTEXPAND where it is not obvious). Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm/i915: add support for E7221 chipsetCarlos Martín2008-01-23
| | | | | | | E7221 chipset is a server version of the i915. Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* drm: DRM: fix memset size errorLi Zefan2007-11-05
| | | | | | | The size passing to memset is wrong. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTLDave Airlie2007-11-05
| | | | | | This is a bug in the savage driver since I introduced these changes. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: remove second forward decleration of drm device struct.Dave Airlie2007-11-05
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm/sis: missing mutex unlock in error path.Roel Kluin2007-11-04
| | | | | | | airlied: separated this out from a patch on lkml. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Dave Airlie <airlied@linux.ie>
* radeon: set the address to access the GART table on the CPU side correctlyDave Airlie2007-11-04
| | | | | | | | This code relied on the CPU and GPU address for the aperture being the same, On some r5xx hardware I was playing with I noticed that this isn't always true. This fixes issues seen on some r400 cards. (bugs.freedesktop.org 9957) Signed-off-by: Dave Airlie <airlied@redhat.com>
* Convert files to UTF-8 and some cleanupsJan Engelhardt2007-10-19
| | | | | | | | | | | | | | | | | | * Convert files to UTF-8. * Also correct some people's names (one example is Eißfeldt, which was found in a source file. Given that the author used an ß at all in a source file indicates that the real name has in fact a 'ß' and not an 'ss', which is commonly used as a substitute for 'ß' when limited to 7bit.) * Correct town names (Goettingen -> Göttingen) * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313) Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
* Use helpers to obtain task pid in printksPavel Emelyanov2007-10-19
| | | | | | | | | | | | | | | | The task_struct->pid member is going to be deprecated, so start using the helpers (task_pid_nr/task_pid_vnr/task_pid_nr_ns) in the kernel. The first thing to start with is the pid, printed to dmesg - in this case we may safely use task_pid_nr(). Besides, printks produce more (much more) than a half of all the explicit pid usage. [akpm@linux-foundation.org: git-drm went and changed lots of stuff] Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* video gfx: merge kconfig menusRandy Dunlap2007-10-16
| | | | | | | | | | | | | | | | 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-16
| | | | | | | | 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-14
| | | | | | | | | 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-14
| | | | | | | 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-14
| | | | | | Oops... Signed-off-by: Dave Airlie <airlied@linux.ie>