0356fe260d
i915_vblank_swap: Add support for DRM_VBLANK_NEXTONMISS.
2006-09-28 15:41:36 +02:00
50a0284a61
Only return EBUSY after we've established we need to schedule a new swap.
2006-09-28 15:41:36 +02:00
89e323e490
Core vsync: Add flag DRM_VBLANK_NEXTONMISS.
...
When this flag is set and the target sequence is missed, wait for the next
vertical blank instead of returning immediately.
2006-09-28 15:41:36 +02:00
7f09f957d9
Fix 'sequence has passed' condition in i915_vblank_swap().
2006-09-28 15:41:36 +02:00
c2bdb76814
Add SAREA fileds for determining which pipe to sync window buffer swaps to.
2006-09-28 15:41:36 +02:00
87c57cba1a
Make handling of dev_priv->vblank_pipe more robust.
...
Initialize it to default value if it hasn't been set by the X server yet.
In i915_vblank_pipe_set(), only update dev_priv->vblank_pipe and call
i915_enable_interrupt() if the argument passed from userspace is valid to avoid
corrupting dev_priv->vblank_pipe on invalid arguments.
2006-09-28 15:41:36 +02:00
d5a0f10751
DRM_I915_VBLANK_SWAP ioctl: Take drm_vblank_seq_type_t instead of pipe number.
...
Handle relative as well as absolute target sequence numbers.
Return error if target sequence has already passed, so userspace can deal with
this situation as it sees fit.
On success, return the sequence number of the vertical blank when the buffer
swap is expected to take place.
Also add DRM_IOCTL_I915_VBLANK_SWAP definition for userspace code that may want
to use ioctl() instead of drmCommandWriteRead().
2006-09-28 15:41:36 +02:00
df7551ef73
Change first valid DRM drawable ID to be 1 instead of 0.
...
This makes it easier for userspace to know when it needs to allocate an ID.
Also free drawable information memory when it's no longer needed.
2006-09-28 15:41:36 +02:00
d04751face
Add copyright notice.
2006-09-28 15:41:36 +02:00
257771fa29
i915: Add ioctl for scheduling buffer swaps at vertical blanks.
...
This uses the core facility to schedule a driver callback that will be called
ASAP after the given vertical blank interrupt with the HW lock held.
2006-09-28 15:41:36 +02:00
23d2833aaa
Locking and memory management fixes.
2006-09-28 15:41:36 +02:00
43f8675534
Export drm_get_drawable_info symbol from core.
2006-09-28 15:41:35 +02:00
af48be1096
Only reallocate cliprect memory if the number of cliprects changes.
...
Also improve diagnostic output.
2006-09-28 15:41:35 +02:00
29598e5253
Add support for tracking drawable information to core
...
Actually make the existing ioctls for adding and removing drawables do
something useful, and add another ioctl for the X server to update drawable
information. The only kind of drawable information tracked so far is cliprects.
2006-09-28 15:41:35 +02:00
0c7d7f4361
Add support for secondary vertical blank interrupt to i915 driver.
...
When the vertical blank interrupt is enabled for both pipes, pipe A is
considered primary and pipe B secondary. When it's only enabled for one pipe,
it's always considered primary for backwards compatibility.
2006-09-28 15:41:35 +02:00
ab351505f3
Add support for secondary vertical blank interrupt to DRM core.
2006-09-28 15:41:35 +02:00
c52fafa628
Don't enable fence / buffer objects on non-linux systems.
...
Bump driver minor and date.
2006-09-28 11:33:03 +02:00
273eb7833d
Add /proc filesystem buffer / fence object accounting.
...
Check for NULL pointer in the i915 flush handler.
Remove i915_sync_flush declaration.
2006-09-25 11:51:08 +02:00
255f3e6f76
bug 7092 : add pci ids for mach64 in Dell poweredge 4200
2006-09-22 03:43:34 +10:00
1f71b8d7a4
do a TCL state flush before accessing VAP_CNTL to prevent lockups on r200 when enabling/disabling vertex programs
2006-09-20 19:44:57 +02:00
fa511a3ff5
Allow for 64-bit map handles of ttms and buffer objects.
2006-09-20 16:31:15 +02:00
22382bd8c5
Add pciid for GeForce Go 6150 (0x0244).
2006-09-17 13:00:27 +10:00
6ba9127753
Use register writes instead of BITBLT_MULTI packets for buffer swap blits.
...
This takes up two more ring buffer entries per rectangle blitted but makes sure
the blit is performed top to bottom, reducing the likelyhood of tearing.
2006-09-15 16:55:40 +02:00
f613022cee
Allow a "native type" to be associated with a fence sequence.
...
In the intel case, we can associate a flush with a sequence.
2006-09-15 16:47:09 +02:00
49fbeb339c
Some bugfixes.
...
Change the fence object interface somewhat to allow some more flexibility.
Make list IOCTLS really restartable.
Try to avoid busy-waits in the kernel using immediate return to user-space with an -EAGAIN.
2006-09-15 11:18:35 +02:00
191e284709
More bugfixes.
...
Disable the i915 IRQ turnoff for now since it seems to be causing problems.
2006-09-12 12:01:00 +02:00
3cc64a943a
drm: use radeon specific names for radeon flags
2006-09-12 06:13:14 +10:00
aa80e2f48f
Add copyright notices while I still remember..
2006-09-09 07:35:55 +10:00
99acb79366
Various bugfixes.
2006-09-08 17:24:38 +02:00
0ef29768ca
Fix second start of X server without module reload beforehand, and a couple of other fixes.
...
- Mark the correct RAMIN slots as free (oops)
- Remove a VRAM alloc that shouldn't have been there (oops)
- Move HT init out of firstopen() and into dma_init()
- Setup PFIFO_RAM{HT,FC,RO} in pfifo_init()
2006-09-07 23:59:19 +10:00
55057660f0
Put the PCI device/vendor id in the drm_device_t.
...
This helps us unbreak FreeBSD DRM from the 965 changes.
2006-09-06 23:25:14 -07:00
d89c623f8e
Remove a 64 bit div.
2006-09-07 00:35:17 +02:00
6042153968
Fence all unfenced buffers function.
2006-09-05 18:00:25 +02:00
034fc31292
i915: Only turn on user IRQs when they are needed.
2006-09-05 14:23:18 +02:00
550f51b4bf
Buffer object wait IOCTL operation.
...
Remove option to wait for fence / buffers and block signals.
2006-09-04 21:50:12 +02:00
b119966ae6
Allow cmdbuf location(AGP,VRAM) and size to be configured.
2006-09-03 06:36:06 +10:00
97291a6ad0
Use DMA_IN_MEMORY for DMA objects. This is needed for a DDX change that will
...
be committed soon after this. Without the change, MEMFORMAT_DMA_OUT appears
to have no effect.
2006-09-02 22:25:26 +10:00
405b5d9ca8
Flag bit pattern bugfixes. Remove some error messages.
2006-09-01 18:11:05 +02:00
ef8e618cf3
Export buffer info on map and validate ioctls.
...
Add an info ioctl operation.
2006-09-01 16:38:06 +02:00
44f6d08988
Validation and fencing.
2006-08-31 21:42:29 +02:00
ec8c79b79d
More mapping synchronization.
...
libdrm validate and fencing functions.
2006-08-31 14:10:13 +02:00
d39055174b
Remove the buffer object hint field and use it only
...
as an argument.
Validate stub.
2006-08-30 17:40:07 +02:00
e47a4fda2e
Memory manager init and takedown.
2006-08-30 13:04:08 +02:00
033bda07e9
Buffer object reply fill in.
...
Lindent of drm_bo.c drm_ttm.c
2006-08-30 09:57:35 +02:00
24dddc2754
Add stub {get,set}param ioctls.
2006-08-30 16:55:02 +10:00
de144ba23c
Part of buffer object libdrm interface.
2006-08-29 21:57:37 +02:00
23f01c9fe8
Checkpoint commit. Buffer object flags and IOCTL argument list.
2006-08-29 18:40:08 +02:00
0dedfc2cd0
Checkpoint ttm addition to buffer objects.
2006-08-29 14:52:02 +02:00
279e8d26c6
64-bit IOCTL integer (Michel Dnzer & Brian Paul)
2006-08-29 10:45:34 +02:00
2057406470
Buffer object creation.
2006-08-28 17:51:53 +02:00
0d67356de4
Proper TTM dereferencing
...
Initial buffer object creation.
2006-08-28 16:36:37 +02:00
3cfab681b3
Merge branch 'master' into nouveau-1
2006-08-29 00:01:19 +10:00
e181f594a4
Add a 64-bit drm unsigned type for 64-bit clean IOCTLS.
...
Conversion functions in drmP.h and xf86drm.c.
2006-08-28 09:49:09 +02:00
4ddabd1562
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
...
Conflicts:
linux-core/drmP.h
2006-08-28 09:28:10 +02:00
9b984b34e9
drm: lots of small cleanups and whitespace issues fixed up
...
remove a mach64 warning, align a lot of things from linux kernel
2006-08-28 11:31:43 +10:00
928bdc6c1c
Initialize i915 saved flush flags.
2006-08-27 21:21:06 +02:00
b4b7b99760
Remove the ioctl multiplexing, and instead allow for generic
...
drm ioctls 0x80 - 0xFF.
2006-08-27 21:16:13 +02:00
65e7274008
ttm create / destroy / ref / unref ioctl.
2006-08-27 19:03:20 +02:00
88928380c8
add pci ids for nouveau
2006-08-27 08:59:50 +10:00
fef9b30a2b
initial import of nouveau code from nouveau CVS
2006-08-27 08:55:02 +10:00
b99e332236
Bug #7595 : Avoid u32 overflows in radeon_check_and_fixup_offset().
...
The overflows could cause valid offsets to get rejected under some
circumstances, e.g. when the framebuffer resides at the very end of the card's
address space.
2006-08-26 12:23:47 +02:00
c488e25ceb
More ioctl stubs.
...
Buffer object locking order documentation.
2006-08-25 20:03:39 +02:00
35c8ce6c29
ttm and buffer objects ioctl stubs.
2006-08-25 19:03:42 +02:00
4c03030b12
Checkpoint commit
...
Buffer object code.
2006-08-25 18:05:35 +02:00
a6535c8db4
Add a fence object class field for future use (For example VSYNC fence objects)
2006-08-22 10:44:09 +02:00
7058d06317
Initial i915 buffer object driver
2006-08-22 10:24:48 +02:00
700bf80ca9
Bring in stripped TTM functionality.
2006-08-22 09:47:33 +02:00
e089de33e8
i915 fence object driver implementing 2 fence object types:
...
0x00 EXE fence. Signals when command stream interpreter has reached the point
where the fence was emitted.
0x01 FLUSH fence. Signals when command stream interpreter has reached the point
where the fence was emitted, and all previous drawing operations have been
completed and flushed.
Implements busy wait (for fastest response time / high CPU) and
lazy wait (User interrupt or timer driven).
2006-08-21 21:36:00 +02:00
166da9355d
User / Kernel space fence objects (device-independent part).
2006-08-21 21:02:08 +02:00
0afb877a37
drm: lots of small cleanups and whitespace issues fixed up
...
remove a mach64 warning, align a lot of things from linux kernel
2006-08-19 17:59:18 +10:00
7a46d41399
i965 code and Linux coding style < 0
...
smack my whitespace up.
2006-08-10 14:38:50 +10:00
48cb9aceed
Add support for Intel i965G chipsets.
...
This is a patch prepared by Guangdeng Liao based off of Tungsten Graphics's
final code drop.
2006-08-08 15:05:54 -07:00
35066b51ef
Revert "Make sure busmastering gets disabled on module unload."
...
This reverts af7b89d724#7629 as well.
2006-07-26 18:21:32 +02:00
645453ce11
Bug #7629 : Fix for CHIP_IS_AGP getting 'restored' with non-AGP cards
...
Commit 2a47f6bfec
2006-07-26 18:19:27 +02:00
af7b89d724
Make sure busmastering gets disabled on module unload.
2006-07-19 15:35:31 -04:00
d5e0f8bdaf
Use RADEON_RB3D_DSTCACHE_CTLSTAT instead of RADEON_RB2D_DSTCACHE_CTLSTAT.
...
The latter seems to be a read-only mirror of the former.
2006-07-19 19:18:32 +02:00
2a47f6bfec
Make sure CHIP_IS_AGP flag is set when not overriding to PCI mode.
...
This allows using AGP after overriding to PCI mode in a previous session
without reloading the DRM.
2006-07-19 19:16:26 +02:00
c91748e702
When writeback isn't used, actually disable it in the hardware.
...
Not doing this might waste bus bandwidth or even cause memory corruption or
system crashes on systems that check bus transfers. No such incident has been
reported though.
2006-07-19 19:13:00 +02:00
e337eadcec
Implement RADEON_PARAM_SCRATCH_OFFSET getparam.
...
When this succeeds, userspace can read the scratch register contents from the
mapped writeback page directly.
2006-07-19 19:07:06 +02:00
7dea64677b
Some debug output when the getparam ioctl is called with an unknown parameter.
2006-07-19 19:01:33 +02:00
b9243ce3d5
.cvsignore -> .gitignore
...
Sort the merged file, remove the redundant explicit .ko lines and add
some generated symlinks.
2006-07-19 18:31:43 +02:00
126673d62a
Keep hashed user tokens, with the following changes:
...
32-bit physical device addresses are mapped directly to user-tokens. No
duplicate maps are allowed, and the addresses are assumed to be outside
of the range 0x10000000 through 0x30000000. The user-token is identical
to the 32-bit physical start-address of the map.
64-bit physical device addressed are mapped to user-tokens in the range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
Other map types, like upcoming TTM maps are mapped to user-tokens in the
range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
This keeps compatibility with buggy drivers, while still implementing a
hashed map lookup. The SiS and via device driver major bumps are
reverted.
2006-07-11 14:37:37 +00:00
a392349691
Change drm Map handles to be arbitrary 32-bit hash tokens in the range
...
0x10000000 to 0x90000000 in PAGE_SIZE increments.
Implement hashed map lookups.
This potentially breaks both 2D and 3D drivers. If so, the corresponding
2D and 3D driver should be fixed, and it's corresponding drm device driver
should have its major bumped as soon as possible.
Bump sis and via drm device driver majors.
The SiS and Unichrome 3D drivers are fixed in Mesa CVS HEAD and
mesa_6_4_branch.
2006-07-10 13:00:21 +00:00
c21a7b763a
SiS 315 Awareness.
2006-07-05 15:52:35 +00:00
da143d0606
Remove spurious debug messages from i915 vblank config paths
2006-06-22 21:34:44 +00:00
f8891ef802
i915: Save vblank pipe configuration to restore on resume
2006-06-21 00:15:10 +00:00
83f256e60e
Add i915 ioctls to configure pipes for vblank interrupt.
...
i915 vblanks can be generated from either pipe a or b, however a disabled
pipe generates no interrupts. This change allows the X server to select
which pipe generates vblank interrupts.
2006-06-19 20:15:53 +00:00
58b63ee5cc
Fix buffer cleanup on close. Move memory manager reset from final_context
...
to lastclose.
2006-06-19 09:12:50 +00:00
96f272884d
via: Bump version number and date.
2006-06-19 09:01:31 +00:00
ca1a77683d
via:
...
-Remove out of memory error message.
-Move sman cleanup from final_context to lastclose.
-Add the P4VM800PRO (?) PCI ID.
2006-06-15 18:37:05 +00:00
6bacb180ce
Merge in the drm-sman-branch
2006-06-06 14:19:00 +00:00
f4e6e4499c
Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new
...
packet type for making it possible to address whole tcl vector space
and have a larger count)
2006-05-24 18:36:24 +00:00
9e0320a0ad
add forgotten register define for previous commit
2006-05-20 09:20:05 +00:00
e1b627c17e
Do a tcl state flush before accessing tcl vector space. This fixes some
...
more problems with flickering (bug #6637 ). drm may not be appropriate
place for this, since doing that flush there might both be overkill and
insufficient in some cases. However, it's hard to figure out when that
flush is needed, so this has to suffice. There does not seem to be a
performance penalty associated with it.
2006-05-20 09:08:18 +00:00
b1a64b8136
add consts to radeon microcode.
...
From: tilman
2006-05-18 07:32:37 +00:00
30a5787d36
Fix from Benh for ppc r300 scratch
2006-04-23 08:07:57 +00:00
4a49e6c366
check for __FreeBSD_kernel__ (bug 3810)
2006-04-20 14:26:59 +00:00
1327222f9b
Err, use "ifndef" rather than "if !", to avoid compiler warning.
2006-04-18 06:12:22 +00:00
40b70e3244
Use __LP64__ instead of checking the linux-specific BITS_PER_LONG.
2006-04-18 05:57:28 +00:00
63c4d02576
Revert a change that accidentally went in with whitespace changes from
...
Linux, which broke on FreeBSD. DRM_COPY_*_IOCTL checks for the size
parameter matching the ioctl's command size there, since the copin/out
happened earlier.
2006-04-09 20:10:32 +00:00
6cb366b5a8
Compile fixes for FreeBSD.
2006-04-08 09:45:43 +00:00
299aad03c2
coverity bugfix from the kernel
2006-04-05 08:34:24 +00:00
985738f203
radeon fix up the PCI ids for new memory map like the kernel one.. not
...
perfect but should be very safe... align some other kernel bits i810
align with kernel
2006-03-25 07:16:14 +00:00
9c92b55953
Bump driver date to reflect airlied's last fix.
2006-03-20 21:40:54 +00:00
8c8f937b3d
make some functions static in via driver
2006-03-19 07:52:53 +00:00
38376c7fa6
Add missing pci ids for new radeons (most but not all are pcie, r420,
...
rv380, rv410), with the exception of the rs400 igps. Hopefully they no
longer lock up with new ddx, but no guarantees... (bug #5413 )
2006-03-17 01:35:34 +00:00
ea40d3dd41
Fix bug I reintroduced
2006-03-08 23:01:32 +00:00
ef835973b2
fix some use before NULL check
2006-03-08 06:03:45 +00:00
4436ab86d8
ia64 support for r300_scratch. (not tested)
2006-03-07 01:08:35 +00:00
b3fdf9bb7a
Add general-purpose packet for manipulating scratch registers (r300)
2006-03-06 20:08:50 +00:00
06e8bd2a0d
Add all radeon pci ids known by ddx, but only r350/rv350 and below (new
...
chips may be problematic). Leave the existing entries for new chips in
though. Remove ids not known by ddx (secondary ids, non-existant,...).
Correct some entries (name/family). Make the radeon family enum look
more alike the ddx/dri versions. See #5413
2006-02-25 09:51:15 +00:00
4c1c05ad96
missed a piece of benh patch
2006-02-19 12:06:27 +00:00
d75fa645ed
fix brace placement
2006-02-18 05:30:03 +00:00
eb5666b089
clear i915 interrupts sources on server exit
2006-02-18 04:13:36 +00:00
7c18b2565e
add proper checking for bitblt multi
2006-02-18 03:21:29 +00:00
9fad101da9
add benh's memory management patch
2006-02-18 03:04:30 +00:00
4791dc8856
major realigment of DRM CVS with kernel code, makes integration much easier
2006-02-18 02:53:36 +00:00
659e9a091d
via: Change via_drm.h versioning scheme after lenghty discussion on
...
unichrome-users.
2006-02-17 17:25:41 +00:00
292d4a5b28
Update the hardware breadcrumb in the sarea on irq reception so that
...
clients can avoid an ioctl waiting on fences that have already been
received. Would be even better if the hardware did the update itself.
2006-02-09 23:14:16 +00:00
1f0da9daca
fix an error message typo Unkown -> Unknown
2006-01-24 21:24:53 +00:00
f19c9eecd1
other part of revert
2006-01-24 21:18:41 +00:00
788750fc8c
put back some of Dave's code related to vblank support - accidentally
...
reverted.
2006-01-24 21:16:54 +00:00
270cffbe43
Fix CMDBUFFER path, add heap destroy and flesh out sarea for rotation
...
(Tungsten Graphics)
2006-01-23 10:05:22 +00:00
9a01593f1a
Add support for texture cache flushes (R300_TX_CNTL)
2006-01-20 21:45:28 +00:00
534bfb3742
Sync from r300_reg.h from Mesa.
2006-01-20 21:30:07 +00:00
e9732865b7
add Intel i945GM support
2006-01-19 14:14:06 +00:00
d394c9fa08
via: direction bug in get_user_pages call in via_dmablit.c fixed. Bumped
...
minor since this causes the via DDX to fail with vlc video player.
2006-01-12 19:08:16 +00:00
2e0c281d1a
via: Version via_drm.h Alter the drm_via_dmablit_t IOCTL arg.
2006-01-06 11:57:40 +00:00
a019c10c30
via: Last commit really required a bump of minor. Fix.
2006-01-06 11:52:01 +00:00
661004544c
via: Combine PCI DMA transfers with stride==width (Idea from Luc
...
Verhaegen). A somewhat saner PCI DMA transfer size check. Fix some
typos. Bump patchlevel.
2006-01-06 11:19:06 +00:00
2a9dbb2895
make max minor more rational
2006-01-02 05:55:31 +00:00
bbcba83ef7
The radeon DRM wasn't passing sparse checking in the kernel, this fixes it
...
by adding a new kernel internal cmd buffer type, that has no userspace
members, and passes it around.
2006-01-02 05:39:19 +00:00
1ad5dfc369
whitespace cleanup/aligment with kernel
2006-01-02 05:22:50 +00:00
b2be72c444
some fixes from linux kernel
2006-01-02 03:44:23 +00:00
fb91c500bf
complete fix for historic attribution
2006-01-02 03:32:03 +00:00
1d86c36655
complete fix for attribution
2006-01-02 03:30:57 +00:00
42cd50fa90
Realign via driver with changes in Linux kernel (mainly whitespace)
2006-01-02 03:25:49 +00:00
780e90e4a2
add radeon card type get param so userspace can avoid walking PCI
2005-12-29 00:17:51 +00:00
b14d15ac41
Add vblank support to i915 DRM..
2005-12-28 23:49:59 +00:00
4c988520a8
step back one reported bugs against that patch
2005-12-28 22:36:51 +00:00
274fdf482b
fix radeon memory mapping from Ben Herrenschmidt
2005-12-16 08:02:17 +00:00
e7b0176584
Lindent some via files
2005-12-16 07:59:13 +00:00
0b4fdc81d1
add texrect support for r300
2005-12-05 01:11:20 +00:00
f5a9f27bf6
Add RV410 X700PRO PCI ID
...
Submitted by: Adam K Kirchhoff <adamk@voicenet.com>
2005-12-02 23:55:21 +00:00
c6344e8df5
Assert an MIT copyright on sis_drm.h, since one was lacking and I created
...
that particular file. Its contents have changed a good bit since the
original sis code, and the original sis code didn't care much about
attribution since it routinely disclaims Precision Insight/VA Linux
from responsibility. Also, adjust formatting around license headers
(have a comment open immediately before the "Copyright" line, not as a
runon of any previous comments) for automatic processing into FreeBSD,
where /*- is used to signal the beginning of license headers for
automatic compilation of license lists.
2005-11-28 23:10:41 +00:00
a5747964ec
Fixed long standing 64-bit bug in via memory manager. Bumped via date and
...
patchlevel.
2005-11-16 10:55:53 +00:00
c8261e3d24
Loosen via dmablit alignment checks somewhat. Adapt stride check to maximum
...
sceen size for EXA.
2005-11-15 11:20:47 +00:00
b5d71f63cd
enable i915 32/64 bit ioctls
2005-11-11 12:23:18 +00:00
224ebd2c8d
RV200 < R200
2005-11-11 10:56:31 +00:00
97528041df
fix up radeon whitespace
2005-11-11 10:02:10 +00:00
Michel Dänzer
Thomas Hellstrom
Anish Mistry
Roland Scheidegger
Ben Skeggs
Dave Airlie
Eric Anholt
Stephane Marchesin
Dave Airlie
Alan Hourihane
Adam Jackson
Thomas Hellstrom
Keith Packard
Roland Scheidegger
Brian Paul
Eric Anholt
Adam Jackson
Aapo Tahkola
Thomas Hellstrom
Keith Whitwell
Alan Hourihane