c8d2d5d419
3dfx DRM depends on PCI
...
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2005-03-25 09:02:20 +00:00
df6ef4836e
For 2.6.12 and 2.6.11.x:
...
Remove incorrect "drm_"-prefix from parameter description.
Signed-off-by: Magnus Damm <damm@opensource.se>
2005-03-25 09:01:27 +00:00
7d3c42b589
Fix for bug 2673 from Egbert Eich - memset the version
2005-03-08 23:47:11 +00:00
81459d6e50
Close a race which could allow for privilege escalation by users with DRI
...
privileges on Radeon hardware. Essentially, a malicious program could
submit a packet containing an offset (possibly in main memory) to be
rendered from/to, while a separate thread switched that offset in
userspace rapidly between a valid value and an invalid one.
radeon_check_and_fixup_offset() would pull the offset in from user
space, check it, and spit it back out to user space to be copied in
later by the emit code. It would sometimes catch the bad value, but
sometimes the malicious program could modify it after the check and get
an invalid offset rendered from/to.
Fix this by allocating a temporary buffer and copying the data in at once.
While here, make the cliprects stuff not do the VERIFYAREA_READ and
COPY_FROM_USER_UNCHECKED gymnastics, avoiding a lock order reversal on
FreeBSD. Performance impact is negligible -- no difference on r200 to
~1% improvement on rv200 in quake3 tests (P4 1Ghz, demofour at
1024x768, n=4 or 5).
2005-02-08 04:17:14 +00:00
dc4defe742
Invalid bound check of driver defined ioctls in drm_ioctl
...
Bug 2489 Reporter: Aapo Tahkola <aet@rasterburn.org>
2005-02-07 22:55:54 +00:00
03ddea5b27
change DRIVER_ to CORE_ makes things look nicer, also change it so the
...
driver name is marked on resource allocations
2005-02-07 11:20:43 +00:00
300e0866d6
fix agp detection on linux
2005-02-07 10:44:28 +00:00
080a547d4d
- Implement drm_initmap, and extend it with the resource number to help
...
FreeBSD. Add drm_get_resource_{start|len} so linux-specific stuff
doesn't need to be in shared code.
- Fix mach64 build by using __DECONST to work around passing a const
pointer to useracc, which is unfortunately not marked const.
- Get rid of a lot of maplist code by not having dev->maplist be a pointer,
and by sticking the link entries directly in drm_local_map_t rather
than having a separate structure for the linked list.
- Factor out map uninit and removal into its own routine, rather than
duplicating in both drm_takedown() and drm_rmmap().
- Hook up more driver functions, and correct FreeBSD-specific bits of
radeon_cp.c, making radeon work.
- Baby steps towards using bus_space as we should.
2005-02-05 08:00:14 +00:00
1dd948f280
make functions static in i915, remove unused functions
2005-02-01 10:43:42 +00:00
62e0a58ecf
update i830 similiar to the kernel, add statics
2005-02-01 10:33:51 +00:00
8d4c731aa1
make more functions static in i810 and fix pageflip cleanup
2005-02-01 10:18:27 +00:00
41cbbb47af
fix radeon drv
2005-01-29 23:05:35 +00:00
311da0f212
hopefully fix drm_core setversion ioctl... pointed out by Eric on irc
2005-01-24 01:05:07 +00:00
9620a0b8bb
Fix cut & paste problem
2005-01-19 10:03:33 +00:00
37318f1675
remove duplicate drm_sysfs.o
2005-01-16 07:49:55 +00:00
354dd17d25
The patch makes drmAddBufs/drmMapBufs can handle buffers in video memory
...
The attached patch adds a new buffer type DRM_FB_BUFFER. It works like AGP
memory but uses video memory.
From: austinyuan@viatech.com.cn (fd.o bug 1668) Signed-off-by: Dave Airlie
<airlied@linux.ie>
2005-01-16 05:40:12 +00:00
ffc51f1f32
Setup MTRRs for frame buffer and aperture manually on Savage3D and
...
Savage4-based cards. Automatic setup in drm_initmap doesn't work due to
the weird alignment and size of the aperture.
2005-01-15 16:55:01 +00:00
d4a8f16eb6
Use virt_to_page instead of vmalloc_to_page in drm_do_vm_shm_nopage for
...
consistent pages allocated with drm_pci_alloc.
2005-01-12 16:07:49 +00:00
6e38fd3576
Adjust 4 level page check for <= 2.6.10
2005-01-09 17:30:44 +00:00
fb6a4d0a7d
via updates: moved the verifier state struct to dev_priv. Implemented AGP
...
alignment check.
2005-01-07 11:37:01 +00:00
c6c7496ca0
Adjust drm-memory for 4 level page tables in 2.6.10 ifdef'd to use 3 levels
...
in kernels older than 2.6.10
2005-01-06 17:09:22 +00:00
04842e8bcf
Completeley rewritten Savage DRM which can be considered secure (modulo
...
implementation errors). Direct hardware (MMIO, BCI) access is no longer
needed in the Mesa driver. Bumped version to 2.0.0. Corresponding
changes to the DDX and Mesa drivers are being committed.
2005-01-01 20:22:58 +00:00
ed165a2529
Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It uses
...
drm_pci_alloc/free for allocating/freeing the memory. Only implemented
in the Linux DRM so far.
2005-01-01 20:03:15 +00:00
fe4ade81bb
i810/i830 bug with Jon's file operations changes
2005-01-01 12:07:51 +00:00
b4782ba76b
Use wbinvd macro instead of assembly for it,
...
From: Stefan Dirsch <sndirsch@suse.de> Signed-off-by: Dave Airlie
<airlied@linux.ie>
2004-12-10 11:53:24 +00:00
98d01f9542
Patch from Jon Smirl from Nov. 2nd that makes older X servers behave well
...
with linux-core. Without this, they will fail on their second
invocation since the drm already has a busID assigned.
Submitted by: Jon Smirl
2004-12-07 12:18:47 +00:00
267e064527
Added 3D functionality to the via command verifier. Modified the via
...
ring-buffer code somewhat to workaround hardware problems. Bumped via
minor version number.
2004-12-03 23:03:36 +00:00
f0a86288fa
patch from bug 1803 - will try and push to kernel soon
2004-11-11 11:09:11 +00:00
4b4df875b2
Fix more build problems on linux-core
2004-11-09 16:58:02 +00:00
76b1a7f2b4
make linux-core build again
2004-11-09 03:36:06 +00:00
cb5aaa8987
Convert more drivers for bsd-core, moving the ioctl definitions to shared
...
code. Remove the "drv" from sisdrv, as it's unnecessary. Use the
drm_pci functions in i915 instead of per-os implementations of the
same. Avoid whitespace within fields in drm_pciids.txt (one of the r300
definitions), since it breaks the bsd pciids script. Tested on sis,
mga, r128. i915 needs more work.
2004-11-06 23:02:07 +00:00
000c8eb18e
Fix Linux build. Why won't this complile? extern int const foo; static
...
struct drm_driver driver = { .var = foo }; error says foo is not
constant
2004-11-06 16:41:24 +00:00
c9202c8965
Commit WIP of BSD conversion to core model. Compiles for r128, radeon, but
...
doesn't run yet. Moves the ioctl definitions for these two drivers back
to the shared code -- they aren't OS-specific.
2004-11-06 01:41:47 +00:00
39a23640b2
Move ati_pcigart shared routines into drm-core module
2004-11-05 17:29:14 +00:00
5128542814
Allow drivers to override reclaim_buffers in an OS-independent way by
...
passing drm_device_t* as first parameter, like in the BSD version.
2004-10-31 15:16:44 +00:00
816a291709
Switch SPIN_LOCK_UNLOCKED to spin_lock_init()
2004-10-29 17:09:54 +00:00
c611cb9f17
Add include of moduleparam.h
2004-10-29 14:38:07 +00:00
b974e2cd68
Break poll() to make it match the Xserver's broken expectations.
2004-10-28 15:52:31 +00:00
b37efdadca
Round 2 of getting rid of inter_module_get()
2004-10-23 18:12:34 +00:00
43cbf43a5f
Revert symbol_get() changes from drm_drv
2004-10-23 14:43:06 +00:00
4b29f85768
fix inter module put/get
2004-10-23 14:00:53 +00:00
1473556e06
actually 2.6.10 introduced pfn range so it should work now..
2004-10-23 07:02:29 +00:00
182a0e5dac
fix pfn vs page for older kernels (2.6.9-rc kernels many not work..)
2004-10-23 06:59:15 +00:00
9ea6fe7aa6
Prepare to eliminate inter_module_get("agp")
2004-10-23 04:21:27 +00:00
ad87dd8427
Bring in patch from kernel for remap_pfn_range
2004-10-22 16:03:21 +00:00
d76f734f68
Fix up the radeon i2c error handing
2004-10-21 16:58:28 +00:00
17ce33835a
Don't release an i2c channel that has not initialized correctly
2004-10-20 16:23:42 +00:00
7ebbebf3d3
Switch linux-core from using dev->pdev->driver->name to
...
dev->driver->pci_driver.name. This avoids the stealth mode case where
pdev is pointing to the wrong driver or no driver.
2004-10-20 05:11:49 +00:00
5ae6c5af75
Fix dd vs di version typo in drm_setversion
2004-10-20 04:41:38 +00:00
157a814be6
Add a protective check against a possible buffer overflow
2004-10-19 18:18:02 +00:00
bcfbd73536
Fix missing I2C busses to be non-fatal error.
2004-10-19 16:30:02 +00:00
ca1ec9268f
drm-core, Clean up bug error path on stealth mode exit
2004-10-19 02:50:14 +00:00
0d89b19325
Update Doxygen configuration & comments.
2004-10-18 14:16:41 +00:00
a8b2c94c18
Remove drm_init.c
2004-10-15 20:37:01 +00:00
91aa32742c
Move drm_cpu_valid out of drm_init. drm_init is empty now.
2004-10-15 20:36:15 +00:00
fa50e2b513
Switch linux-core over to 2.6 parameter model to enable debug use
...
drm_debug=1
2004-10-15 02:59:35 +00:00
5e8838fd11
Add a poll function that alternates between zero and normal poll return to
...
bring DRM into conformance with normal poll().
2004-10-13 16:40:53 +00:00
ad70dc676e
Breakout heads into their own data structures.
2004-10-12 03:59:17 +00:00
ad549c5ae6
Rename fn_tbl to driver. Core driver now uses pci_driver name which
...
reflects the personality name.
2004-10-10 22:54:55 +00:00
efcb9fb7ae
fix up whitespacing in Kconfig
2004-10-09 11:16:20 +00:00
e09229d6c8
remove unused dma remnants that were gamma only - these could cause an oops
...
on via
2004-10-09 10:58:19 +00:00
3981f17227
Fix refcount bug in stealth mode
2004-10-08 14:31:25 +00:00
61d36f6179
Revert back to drm_order() instead of using kernel get_order(). The
...
functions are not identical.
2004-10-06 16:27:55 +00:00
4dbc1e8728
Patch for Kconfig for making i830/i915 not build together
2004-10-05 12:12:01 +00:00
6dee8401a6
enable the device in the right order, remove __devinit from drm_int
2004-10-05 02:58:14 +00:00
e17abf5d5d
Make the debug memory functions compile for the core model.
2004-09-30 23:47:45 +00:00
a36a6a291d
Remove DRM() macros from core ffb driver. DaveA says he'll make it compile
...
someday.
2004-09-30 21:27:59 +00:00
9f9a8f1382
Lindent of core build. Drivers checked for no binary diffs. A few files
...
weren't Lindent's because their comments didn't convert very well. A
bunch of other minor clean up with no code implact included.
2004-09-30 21:12:10 +00:00
368493edc9
savage.h not used in core builds
2004-09-30 21:06:53 +00:00
e1d74a9899
core ffb.h is not used anymore
2004-09-30 20:46:59 +00:00
b3d70ad6a7
Remove unused drm_module.h
2004-09-30 20:25:13 +00:00
1c0a437fa2
Move things around to reduce public symbols and even out files. Switch to
...
get_order from drm_order.
2004-09-30 19:26:35 +00:00
3aef3841d0
Make fops per driver instead of global, remove default flush, poll, read
...
functions
2004-09-30 18:13:33 +00:00
0bff0d9eb6
Getting the AGP module is a global resource. Make sure a dual PCI/AGP
...
driver doesn't release it on unload since an AGP driver may also be
loaded.
2004-09-28 22:25:06 +00:00
6d6526fdf9
core needs three new files
2004-09-27 19:53:51 +00:00
fa6b1d129e
First check in for DRM that splits core from personality modules
2004-09-27 19:51:38 +00:00
77fa7b9548
Flip the 2.4 check so that it looks for 2.6 instead. This will allow builds
...
where we can't determine the version through.
2004-09-27 15:42:48 +00:00
1d6392f1fd
Makefile reminder to build in 2.6 when on 2.6
2004-09-24 04:21:21 +00:00
74f063fc9d
Create new linux-2.6 build. Move all gpl files into the 2.6 build. If you
...
edit files for 2.6 be sure and break the link to the 2.4 directory and
copy the cvs history.
2004-09-24 03:12:17 +00:00
36a257cfe9
Remove 2.6 code that allow DRM major device number to be shared. We can add
...
it back later if needed. Checked DRM on both 2.4 and
2.6 to ensure that it builds and runs.
2004-09-23 17:22:27 +00:00
55c5e24089
Add new sysfs support files
2004-09-23 05:40:05 +00:00
c158a36c4c
1) switches from class_sysfs to drm sysfs implementation to allow
...
customization
2) compiles again on 2.4, but doesn't work
2004-09-23 05:39:15 +00:00
af326f6f0c
Create permanent maps of framebuffer, aperture and MMIO registers. Added
...
chipset-type information in driver data field of Savage PCI-IDs. Added
missing PCI-ID 0x8d03 (ProSavageDDR on Pentium boards). Don't require
AGP.
2004-09-22 22:51:18 +00:00
27fc998f7d
Remove hotplug reset support from DRM driver. This will be handled by the
...
VGA driver when it gets written.
2004-09-22 19:13:02 +00:00
2ad068005a
Make DRM permanent maps match broken X behavior. X is mapping regions that
...
are both smaller and larger than what the hardware supports. If DRM
tries to fix these requests X will fail.
2004-09-21 05:13:21 +00:00
6f31c42fe9
Remove size restriction on permanent addmap
2004-09-20 19:23:27 +00:00
59cc1d8256
Felix's fix for map request smaller than permanent map size
2004-09-20 17:09:26 +00:00
5654880eee
remove HAVE_COUNTERS
2004-09-20 11:29:16 +00:00
fa75a81c9a
another fix after the macro stuff
2004-09-20 10:45:53 +00:00
c15b1d15ff
Fix from: Nishanth Aravamudan replace direct assignment with
...
__set_current_state()
2004-09-18 16:44:43 +00:00
0c6fb0fbe1
Add linux sysfs i2c support to radeon driver. This patch adds GPL licensed
...
files to the linux build but not to the BSD directories.
2004-09-17 04:02:28 +00:00
c7c9d3ef7b
Let's try adding the dyn-minor patch again. This patch will reuse minor
...
numbers if a card is hotplugged in/out instead of just having them
increase.
2004-09-16 18:42:03 +00:00
5dfd89ae0a
Fix drm_scatter to properly report it's availability
2004-09-16 14:32:17 +00:00
eeb0ef1a70
Back dyn-minor patch out for now. fops handling is broken on some cards
2004-09-15 17:44:30 +00:00
941d2cf431
Don't use module_param if it isn't defined in older kernels.
2004-09-15 16:06:50 +00:00
64ef12c55c
Dynamic device minor support. Minor device numbers will be reused if the
...
device is hotplugged in/out of the system
2004-09-15 00:20:21 +00:00
13cb3f1b00
Fix error path in probe() to release resources if there is an error.
2004-09-12 19:24:08 +00:00
15407efd46
Make the comment match the code
2004-09-12 03:30:30 +00:00
36050cc958
Fix DRM to compile cleanly with recent kernel changes in PCI IO and
...
DRM_COPY_FROM_USER. PCI IO changes in 2.6.9-rc1 bk currently.
2004-09-12 03:23:50 +00:00
e6d468ad7f
More general patch to mark resources in use by all DRM drivers. Makes the
...
code Linux specific.
2004-09-10 16:44:28 +00:00
Dave Airlie
Eric Anholt
Alan Hourihane
Felix Kuehling
Jon Smirl
Thomas Hellstrom
Jose Fonseca