aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
Commit message (Collapse)AuthorAge
...
| * drm: fix warning on alphaDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> On alpha: drivers/char/drm/via_dmablit.h:44: error: field `direction' has incomplete type Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove is_pci flag completely...Dave Airlie2006-01-03
| | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: merge in Linus mainlineDave Airlie2006-01-03
| |\
| * | drm: major update from CVS for radeon and coreDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | This patch pull in a lot of changes from CVS to the main core DRM, and updates the radeon driver to 1.21.0 that supports r300 texrect and radeon card type ioctl. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update drm pci ids listDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | Apply the fixes from CVS that were outstanding for this file Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update lock flags from userspaceDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update to i915 1.3.0Dave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update drm_memory_debug.hDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | Update from DRM CVS for drm memory debug From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: proper fix for drm_contextDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix issue with contexts running out of RAMDave Airlie2006-01-02
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update PCIGART support from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | In order to work on FreeBSD the gart needed to use a local mapping This patch moves the mainline to the new code and aligns some comment changes From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-02
| | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: bring savage inline with latest CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | apply some whitespace cleanup and add wrappers for MTRR for OS calls From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix a LOR issue on FreeBSD for savage driverDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a LOR issue on FreeBSD by allocating temporary space and doing a single DRM_COPY_FROM_USER rather than DRM_VERIFYAREA_READ followed by tons of DRM_COPY_FROM_USER_UNCHECKED. I don't like the look of the temporary space allocation, but I like the simplification in the rest of the file. Tested with glxgears, tuxracer, and q3 on a savage4. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: bring sis + tdfx up to latest CVSDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | Cleanup SIS + TDFX drivers with latest changes from CVS. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: via driver update to CVS versionDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the DRM via driver to the latest CVS version, which contains support for DMA blitting. It also contains some whitespace and other minor fixes From: Thomas Hellstrom <unichrome@shipmail.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: move ioctl flags to a bit field of flagsDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | From: Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update VIA driver to 2.7.2Dave Airlie2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add PCI DMA blitengine to VIA DRM Add portability code for porting VIA to FreeBSD. Sync via_drm.h with 3d driver From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: drop mtrr from i915Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | Alan Hourihane wants to set MTRR in the DDX only as otherwise we get problems with the shared memory chipset. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update mga driver for new bootstrap codeDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | The MGA driver needs to use the full AGP interface. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove exports that modules shouldn't use.Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | Modules should go via the new drm_agp_ functions. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: add in-kernel entry points for rest of AGP ioctlsDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | Allow DRM modules to call AGP internally in the kernel. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: simplify sysfs code for drmDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the sysfs code for the drm and add a dri_library_name attribute which can be used by a userspace app to figure out which library to load. From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup drm_proc.c struct tableDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove old backwards compatibilty stuffDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove drm_flushDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | drm_flush is no longer needed remove. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: cleanup via_ds.c includesDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | Remove the linux includes from via_ds.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove remnamt of old DRM code from tdfxDave Airlie2005-11-11
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove drm_init.c it is no longer neededDave Airlie2005-11-10
| | | | | | | | | | | | | | | | | | Move drm_cpu_valid into drm_fops.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: rename driver hooks more understandablyDave Airlie2005-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the driver hooks in the DRM to something a little more understandable: preinit -> load postinit -> (removed) presetup -> firstopen postsetup -> (removed) open_helper -> open prerelease -> preclose free_filp_priv -> postclose pretakedown -> lastclose postcleanup -> unload release -> reclaim_buffers_locked version -> (removed) postinit and version were replaced with generic code in the Linux DRM (drivers now set their version numbers and description in the driver structure, like on BSD). postsetup wasn't used at all. Fixes the savage hooks for initializing and tearing down mappings at the right times. Testing involved at least starting X, running glxgears, killing glxgears, exiting X, and repeating. Tested on: FreeBSD (g200, g400, r200, r128) Linux (r200, savage4) From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | | [PATCH] don't include ioctl32.h in driversChristoph Hellwig2006-01-10
| |/ |/| | | | | | | | | | | | | | | | | | | These days ioctl32.h is only used for communication of fs/compat.c and fs/compat_ioctl.c and doesn't contain anything of interest to drivers. Remove inclusion in various drivers. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Revert radeon AGP aperture offset changesLinus Torvalds2005-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the series of commits 67dbb4ea33731415fe09c62149a34f472719ac1d 281ab031a8c9e5b593142eb4ec59a87faae8676a 47807ce381acc34a7ffee2b42e35e96c0f322e52 that changed the GART VM start offset. It fixed some machines, but seems to continually interact badly with some X versions. Quoth Ben Herrenschmidt: "So I think at this point, the best is that we keep the old bogus code that at least is consistent with the bug in the server. I'm working on a big patch to X that reworks the memory map stuff completely and fixes those issues on the server side, I'll do a DRM patch matching this X fix as well so that the memory map is only ever set in one place and with what I hope is a correct algorithm..." Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Fix more radeon GART start calculation casesBenjamin Herrenschmidt2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Jules Villard <jvillard@ens-lyon.fr> and some others, the recent GART aperture start reconfiguration causes problems on some setups. What I _think_ might be happening is that the X server is also trying to muck around with the card memory map and is forcing it back into a wrong setting that also happens to no longer match what the DRM wants to do and blows up. There are bugs all over the place in that code (and still some bugs in the DRM as well anyway). This patch attempts to avoid that by using the largest of the 2 values, which I think will cause it to behave as it used to for you and will still fix the problem with machines that have an aperture size smaller than the video memory. Acked-by: Jules Villard <jvillard@ens-lyon.fr> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] radeon drm: fix compilation breakage with gcc 2.95.3Jean Delvare2005-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo which breaks radeon drm compilation with gcc 2.95.3. The offending line was added back in 2.6.11-rc3, but was harmless back then. A recent addition nearby changed it into a compilation breaker: commit 281ab031a8c9e5b593142eb4ec59a87faae8676a. The doubled semi-colon ends up being an empty instruction, and the variable declaration thus ends up being in the middle of "code". Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Mark M. Hoffman <mhoffman@lightlink.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] radeon drm: fix agp aperture map offsetBenjamin Herrenschmidt2005-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finally fixes the radeon memory mapping bug that was incorrectly fixed by the previous patch. This time, we use the actual vram size as the size to calculate how far to move the AGP aperture from the framebuffer in card's memory space. If there are still issues with this patch, they are due to bugs in the X driver that I'm working on fixing too. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Mark M. Hoffman <mhoffman@lightlink.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [drm] fix radeon aperture issueDave Airlie2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | Ben noticed that on certain cards we've landed the AGP space on top of the second aperture instead of after it.. Which messes things up a lot on those machines. This just moves the gart further out, a more correct fix is in the works from Ben for after 2.6.15. Signed-off-by: Dave Airlie <airlied@linux.ie> CC: Ben Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] SiS DRM: Fix possible NULL dereferenceEgbert Eich2005-11-30
| | | | | | | | | | | | | | | | | | | | | | This fixes a NULL pointer reference in DRM. The SiS driver tries to allocate a big chunk of memory, but the return value is never checked. Reported in Novell bugzilla #132271: https://bugzilla.novell.com/show_bug.cgi?id=132271 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | drm: fix quiescent lockingDave Airlie2005-11-24
| | | | | | | | | | | | | | | | | | | | | | A fix for a locking bug which is triggered when a client tries to lock with flag DMA_QUIESCENT (typically the X server), but gets interrupted by a signal. The locking IOCTL should then return an error, but if DMA_QUIESCENT succeeds it returns 0, and the client falsely thinks it has the lock. In addition The client waits for DMA_QUISCENT and possibly DMA_READY without having the lock. From: Thomas Hellstrom Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: move is_pci to the end of the structureDave Airlie2005-11-23
| | | | | | | | | | | | | | | | We memset the structure across opens except for the flags. The correct fix is more intrusive but this should fix a problem with bad iounmaps seen on AGP radeons acting like PCI ones. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: add __GFP_COMP to the drm_alloc_pagesDave Airlie2005-11-23
| | | | | | | | | | | | | | The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | I think that if a PCI bus is a root bus, attached to a host bridge not aDave Airlie2005-11-23
|/ | | | | | | | PCI->PCI bridge, then bus->self is allowed to be NULL. Certainly that's the case on my Pegasos, and it makes the MGA DRM driver oops... Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* [PATCH] drm fixup pci gart settingsDave Airlie2005-11-09
| | | | | | | | | | | | | Fix the PCIGART increment and add a cpu_to_le32 for ppc (untested) Paulus was unsure if we need to cpu_to_le32 but the old code was definitely wrong, so make it consistent and let the PPC guys figure it out later. Signed-off-by: Dave Airlie <airlied@linux.ie> Cc: Paul Mackerras <paulus@samba.org> Cc: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] kfree cleanup: drivers/charJesper Juhl2005-11-07
| | | | | | | | | | This is the drivers/char/ part of the big kfree cleanup patch. Remove pointless checks for NULL prior to calling kfree() in drivers/char/. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6Linus Torvalds2005-11-02
|\ | | | | | | Manual fixups for some clashes due to re-indenting.
| * drm: remove unused components of drm structuresDave Airlie2005-10-24
| | | | | | | | | | | | These haven't been used in quite a long time, takes 1K buffer out of structures. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix warning on 64-bit platforms..Dave Airlie2005-10-24
| | | | | | | | | | | | | | This looks ugly, but it is the only thing that makes sense that doesn't change the API. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * merge linus head to drm-mm branchDave Airlie2005-10-22
| |
| * merge linus head to drm-mm branchDave Airlie2005-10-22
| |\
| * \ merge Linus head tree into my drm tree and fix up conflictsDave Airlie2005-10-20
| |\ \
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-12 22:12:05 -0500