aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* drm: kill drm_device->irqJesse Barnes2008-10-188-15/+11
| | | | | | | | | Like the last patch but adds a macro to get at the irq value instead of dereferencing pdev directly. Should make things easier for the BSD guys and if we ever support non-PCI devices. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: wbinvd is cache coherent.Dave Airlie2008-10-181-9/+2
| | | | | | doing an ipi for the wbinvd case isn't necessary. Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: add missing return in error path.Dave Airlie2008-10-181-0/+1
| | | | Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: fixup permissions on gem ioctls.Dave Airlie2008-10-181-3/+3
| | | | | | init/entervt/leavevt should be root-only master ioctls. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Clean up many sparse warnings in i915.Eric Anholt2008-10-183-29/+32
| | | | | Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Use ioremap_wc in i915_driver instead of ioremap, since we always want WC.Eric Anholt2008-10-181-6/+9
| | | | | | | | Fixes failure to map the ringbuffer when PAT tells us we don't get to do uncached on something that's already mapped WC, or something along those lines. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: G33-class hardware has a newer 965-style MCH (no DCC register).Eric Anholt2008-10-181-1/+1
| | | | | | | | Fixes bad software fallback rendering in Mesa in dual-channel configurations. d9a2470012588dc5313a5ac8bb2f03575af00e99 Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Avoid oops in GEM execbuffers with bad arguments.Eric Anholt2008-10-181-0/+4
| | | | | Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* DRM: Return -EBADF on bad object in flink, and return curent name if it exists.Eric Anholt2008-10-181-2/+3
| | | | | Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915 gem: install and uninstall irq handler in entervt and leavevt ioctls.Kristian Høgsberg2008-10-182-0/+6
| | | | | | Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Make use of sarea_priv conditional.Kristian Høgsberg2008-10-182-15/+31
| | | | | | | | We fail ioctls that depend on the sarea_priv with EINVAL. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Use struct_mutex to protect ring in GEM mode.Eric Anholt2008-10-184-10/+63
| | | | | | | | | | | In the conversion for GEM, we had stopped using the hardware lock to protect ring usage, since it was all internal to the DRM now. However, some paths weren't converted to using struct_mutex to prevent multiple threads from concurrently working on the ring, in particular between the vblank swap handler and ioctls. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Add chip set ID param.Kristian Høgsberg2008-10-182-0/+4
| | | | | | Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Add GEM ("graphics execution manager") to i915 driver.Eric Anholt2008-10-1823-62/+4832
| | | | | | | | | | | | | | | | GEM allows the creation of persistent buffer objects accessible by the graphics device through new ioctls for managing execution of commands on the device. The userland API is almost entirely driver-specific to ensure that any driver building on this model can easily map the interface to individual driver requirements. GEM is used by the 2d driver for managing its internal state allocations and will be used for pixmap storage to reduce memory consumption and enable zero-copy GLX_EXT_texture_from_pixmap, and in the 3d driver is used to enable GL_EXT_framebuffer_object and GL_ARB_pixel_buffer_object. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Export kmap_atomic_pfn for DRM-GEM.Eric Anholt2008-10-181-0/+1
| | | | | | | | | The driver would like to map IO space directly for copying data in when appropriate, to avoid CPU cache flushing for streaming writes. kmap_atomic_pfn lets us avoid IPIs associated with ioremap for this process. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Export shmem_file_setup for DRM-GEMKeith Packard2008-10-181-0/+1
| | | | | | | | | | | GEM needs to create shmem files to back buffer objects. Though currently creation of files for objects could have been driven from userland, the modesetting work will require allocation of buffer objects before userland is running, for boot-time message display. Signed-off-by: Eric Anholt <eric@anholt.net> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Rework vblank-wait handling to allow interrupt reduction.Jesse Barnes2008-10-1821-473/+1189
| | | | | | | | | | | | | | | Previously, drivers supporting vblank interrupt waits would run the interrupt all the time, or all the time that any 3d client was running, preventing the CPU from sleeping for long when the system was otherwise idle. Now, interrupts are disabled any time that no client is waiting on a vblank event. The new method uses vblank counters on the chipsets when the interrupts are turned off, rather than counting interrupts, so that we can continue to present accurate vblank numbers. Co-author: Michel Dänzer <michel@tungstengraphics.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/cred: wrap task credential accesses in the drm driver.David Howells2008-10-181-1/+1
| | | | | | | | | | | | | | | | Wrap access to task credentials so that they can be separated more easily from the task_struct during the introduction of COW creds. Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id(). Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more sense to use RCU directly rather than a convenient wrapper; these will be addressed by later patches. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: James Morris <jmorris@namei.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: David Airlie <airlied@redhat.com>
* new chip name is GM45Jesse Barnes2008-10-182-4/+4
| | | | | | | | | | Author: Zhenyu Wang <zhenyu.z.wang@intel.com> i915: official name for GM45 chipset Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* separate i915 suspend/resume functions into their own fileJesse Barnes2008-10-184-461/+524
| | | | | | | | | | | | | [Patch against drm-next. Consider this a trial balloon for our new Linux development model.] This is a big chunk of code. Separating it out makes it easier to change without churn on the main i915_drv.c file (and there will be churn as we fix bugs and add things like kernel mode setting). Also makes it easier to share this file with BSD. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* radeon: fix writeback across suspend/resume.Dave Airlie2008-10-181-2/+3
| | | | | | Make writeback not get disabled on resume. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: fix sysfs error path.Dave Airlie2008-10-181-1/+1
| | | | | | Pointed out by Roel Kluin on dri-devel. Signed-off-by: Dave Airlie <airlied@redhat.com>
* FB_SIS=m, DRM_SIS=y is not a legal configuration.Adrian Bunk2008-10-181-0/+1
| | | | | | Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Add Intel ACPI IGD OpRegion supportMatthew Garrett2008-10-187-9/+415
| | | | | | | | | This adds the support necessary for allowing ACPI backlight control to work on some newer Intel-based graphics systems. Tested on Thinkpad T61 and HP 2510p hardware. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* i915: Initialize hardware status page at device load when possible.Keith Packard2008-10-181-29/+57
| | | | | | | | Some chips were unstable with repeated setup/teardown of the hardware status page. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Track progress inside of batchbuffers for determining wedgedness.Keith Packard2008-10-181-1/+10
| | | | | | | This avoids early termination for long-running commands. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Add support for MSI and interrupt mitigation.Eric Anholt2008-10-184-55/+145
| | | | | | | | | | | Previous attempts at interrupt mitigation had been foiled by i915_wait_irq's failure to update the sarea seqno value when the status page indicated that the seqno had already been passed. MSI support has been seen to cut CPU costs by up to 40% in some workloads by avoiding other expensive interrupt handlers for frequent graphics interrupts. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Use more consistent names for regs, and store them in a separate file.Jesse Barnes2008-10-185-892/+1508
| | | | | Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: Ignore X server provided mmio addressKeith Packard2008-10-181-12/+0
| | | | | | | It is already correctly detected by the kernel for use in suspend/resume. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* i915: remove settable use_mi_batchbuffer_startKeith Packard2008-10-182-11/+1
| | | | | | | | The driver can know what hardware requires MI_BATCH_BUFFER vs MI_BATCH_BUFFER_START; there's no reason to let user mode configure this. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
* SiS DRM: fix a pointer cast warningDavid Howells2008-10-181-1/+1
| | | | | | | | | | | Fix a pointer cast warning in the SIS DRM code. This was introduced in patch ce65a44de07f73ceda1749812b75086b7add408d. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* SiS DRM: fix the memory allocator if the SIS FB is built as a moduleDavid Howells2008-10-181-4/+4
| | | | | | | | | | | | Fix the SIS DRM memory allocator if the SIS FB built as a module. The SIS DRM code initialises the mm allocation hooks, but _only_ if the SIS FB is not built as a module because it depends on CONFIG_FB_SIS, and that's unset if the SIS FB is not built in. It must check CONFIG_FB_SIS_MODULE as well. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: remove #define's for non-linux systemsCarlos R. Mafra2008-10-181-17/+0
| | | | | | | | | There is no point in considering FreeBSD et al. in the linux kernel source code. Signed-off-by: Carlos R. Mafra <crmafra@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2008-10-17211-1/+152422
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits) staging: at76_usb wireless driver Staging: workaround build system bug Staging: Lindent sxg.c Staging: SLICOSS: Call pci_release_regions at driver exit Staging: SLICOSS: Fix remaining type names Staging: SLICOSS: Fix warnings due to static usage Staging: SLICOSS: lots of checkpatch fixes Staging: go7007 v4l fixes Staging: Fix gcc warnings in sxg Staging: add echo cancelation module Staging: add wlan-ng prism2 usb driver Staging: add w35und wifi driver Staging: USB/IP: add host driver Staging: USB/IP: add client driver Staging: USB/IP: add common functions needed Staging: add the go7007 video driver Staging: add me4000 pci data collection driver Staging: add me4000 firmware files Staging: add sxg network driver Staging: add Alacritech slicoss network driver ... Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in MAINTAINERS, include/linux/kernel.h and kernel/panic.c.
| * staging: at76_usb wireless driverPavel Roskin2008-10-137-0/+6192
| | | | | | | | | | | | | | | | | | | | | | | | | | Add the at76_usb wireless driver to the staging tree while the other kernel driver (out of tree) gets rewritten to use the internal wireless stack. This patch comes directly from the Fedora kernel tree, with only the directory placement of the files changed. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: workaround build system bugGreg Kroah-Hartman2008-10-132-0/+22
| | | | | | | | | | | | | | | | | | | | This is needed as CONFIG_STAGING is set to y, yet there is no code in drivers/staging/ to build, so the build-in.o doesn't get created properly. Create a "dummy" module in drivers/staging called staging.c to work around this bug. Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Lindent sxg.cJ.R. Mauro2008-10-101-65/+81
| | | | | | | | | | | | | | | | Lindent drivers/staging/sxg/sxg.c Signed-off by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: SLICOSS: Call pci_release_regions at driver exitLior Dotan2008-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | slic_entry_probe() calls pci_request_regions() but there's no matching pci_release_regions() at driver's exit or if slic_entry_probe() fails. Signed-off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: SLICOSS: Fix remaining type namesLior Dotan2008-10-104-21/+23
| | | | | | | | | | | | | | | | | | Fix the remaining variables that still had '_t' as a postfix and also a couple of checkpatch warnings. Signed-off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: SLICOSS: Fix warnings due to static usageLior Dotan2008-10-102-7/+2
| | | | | | | | | | | | | | | | | | | | Fix a few warning messages that crept in due to conversion of all the functions to static Signed-off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: SLICOSS: lots of checkpatch fixesLior Dotan2008-10-1013-1619/+1353
| | | | | | | | | | | | | | | | | | Major cleanups of checkpatch warnings from the slicoss driver. From: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: go7007 v4l fixesRoss Cohen2008-10-1010-71/+59
| | | | | | | | | | | | | | | | | | | | Fix up some of the v4l issues that were recently changed to make the go7007 driver a bit cleaner. From: Ross Cohen <rcohen@snurgle.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Fix gcc warnings in sxgJ.R. Mauro2008-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | Fix for compiler warning about format specifier in prints in drivers/staging/sxg/sxg.c Prints were using %x to print unsigned long data. Signed-off-by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: add echo cancelation moduleDavid Rowe2008-10-1010-0/+1785
| | | | | | | | | | | | | | | | | | | | This is used by mISDN and Zaptel drivers. From: Steve Underwood <steveu@coppice.org> From: David Rowe <david@rowetel.com> Cc: Tzafrir Cohen <tzafrir.cohen@xorcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: add wlan-ng prism2 usb driverGreg Kroah-Hartman2008-10-1037-0/+36060
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the wlan-ng prism2 USB driver to the drivers/staging tree. The code was originally written by the linux-wlan-ng team, patched by some Novell engineers to properly work on newer kernels, and then hacked into place in order to get it to build properly in a single subdirectory within the kernel tree by me. It supports a wide range of older USB prism2 devices, and contains a 80211 stack to support this single driver. Cc: Christian Zoz <zoz@suse.de> Cc: Andreas Gruenbacher <agruen@suse.de> Cc: linux-wireless <linux-wireless@vger.kernel.org> Cc: John Linville <linville@tuxdriver.com> Cc: Helmut Schaa <helmut.schaa@googlemail.com> Cc: linux-wlan-ng <solomon@linux-wlan.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: add w35und wifi driverPavel Machek2008-10-1053-0/+14522
| | | | | | | | | | | | | | | | | | | | | | | | | | This is driver for w35und usb wifi -- also in kohjinsha subnotebook. It should work well enough to associate and ping, but it obviously needs to be rewritten two more times... OTOH worst horrors (like embedded wifi stack) should have been fixed already... Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: USB/IP: add host driverTakahiro Hirofuchi2008-10-107-0/+1878
| | | | | | | | | | | | | | | | | | | | | | | | This adds the USB IP client driver Brian Merrell cleaned up a lot of this code and submitted it for inclusion. Greg also did a lot of cleanup. Signed-off-by: Brian G. Merrell <bgmerrell@novell.com> Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: USB/IP: add client driverTakahiro Hirofuchi2008-10-107-0/+2171
| | | | | | | | | | | | | | | | | | | | | | | | This adds the USB IP client driver Brian Merrell cleaned up a lot of this code and submitted it for inclusion. Greg also did a lot of cleanup. Signed-off-by: Brian G. Merrell <bgmerrell@novell.com> Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: USB/IP: add common functions neededTakahiro Hirofuchi2008-10-108-0/+1573
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds the common functions needed by both the host and client side of the USB/IP code. Brian Merrell cleaned up a lot of this code and submitted it for inclusion. Greg also did a lot of cleanup. Signed-off-by: Brian G. Merrell <bgmerrell@novell.com> Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: add the go7007 video driverGreg Kroah-Hartman2008-10-1022-0/+9269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo: - checkpatch.pl cleanups - sparse cleanups - lots of little modules, should be merged together and added to the build. - testing? - handle churn in v4l layer. Many thanks to Ross Cohen <rcohen@snurgle.org> for cleanup patches on this driver. Cc: Ross Cohen <rcohen@snurgle.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.1 at 2024-12-26 20:32:59 +0000