f984b1b8d1
Fix some obvious bugs.
2007-06-12 12:30:33 +02:00
b6b5df24b9
Try to make buffer object / fence object ioctl args 64-bit safe.
...
Introduce tile members for future tiled buffer support.
Allow user-space to explicitly define a fence-class.
Remove the implicit fence-class mechanism.
64-bit wide buffer object flag member.
2007-06-12 12:21:38 +02:00
280083d4a2
use krh's idr mods to remove lists from idr code
2007-06-10 15:40:21 +10:00
7426da7538
oops must fix this properly at some point
2007-06-07 18:45:00 +10:00
e22f428f5f
drm: fix radeon setparam alignment issues on 32/64-bit
2007-06-07 18:41:18 +10:00
5bd0ca125e
remove include of linux ioctl32.h from drm drivers
2007-06-05 18:16:44 +10:00
a4cddc6596
Revert "drm: add new drm_wait_on function to replace macro"
...
This reverts commit 6e860d08d0
2007-06-03 18:12:28 +10:00
4e9d215bdf
radeon: add support for vblank on crtc2
...
This add support for CRTC2 vblank on radeon similiar to the i915 support
2007-06-03 16:28:21 +10:00
638c8087de
drm: fixup initialisation of list heads and idr
2007-06-01 19:00:24 +10:00
056c2f249a
drm: move context handling code to use linux idr
2007-05-27 08:44:38 +10:00
f64674743a
drm: convert drawable handling to use Linux idr
...
This cleans this code up a lot and uses the generic Linux idr which is
designed for this.
Signed-off-by: Dave Airlie <airlied@linux.ie>
2007-05-27 07:26:52 +10:00
8e083c522e
drm: make sure the drawable code doesn't call malloc(0).
...
Signed-off-by: Michel Dänzer <michel@tungstengraphics.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2007-05-26 04:35:54 +10:00
58b2ed7832
Revert "drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls."
...
This reverts commit 3fdef0dc20
2007-05-26 03:48:08 +10:00
375f3f2884
Revert "drm/ttm: cleanup most of fence ioctl split out"
...
This reverts commit 3dfc1400e9
2007-05-26 03:47:48 +10:00
ce58e53a01
whitespace fixups from kernel
2007-05-26 03:32:34 +10:00
adee6f52e6
ati_pcigart: cut to 80 chars
2007-05-26 03:32:34 +10:00
3dfc1400e9
drm/ttm: cleanup most of fence ioctl split out
2007-05-26 03:32:34 +10:00
3fdef0dc20
drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls.
...
This is the first bunch of ioctls
2007-05-26 03:32:34 +10:00
7b48f0022a
drm: cleanup use of Linux list handling macros
...
This makes the drms use of the list handling macros a lot cleaner
and more along the lines of how they should be used.
2007-05-26 04:26:24 +10:00
fa92e1f2ec
Suspend/resume shouldn't call drm_initial_config (seems to work ok for me now),
...
also we should fail if we can't enable the device at resume time.
2007-05-24 18:41:44 -07:00
462d5a0dfc
Suspend/resume support (incomplete).
2007-05-22 17:49:04 -07:00
e918d2b781
Call preallocated space VRAM instead of PRIV0 to be more consistent with
...
other drivers.
2007-05-22 13:38:58 -07:00
a4929b921e
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
...
Conflicts:
linux-core/drm_crtc.c - reconcile with locking changes
2007-05-18 09:42:51 -07:00
f894587221
Add locking. The main lock is dev->mode_config.config_lock. It should be
...
held across any operations that modify mode lists, crtc config, output
config, etc. It should be taken at high level entry points (currently just
initial config and user IOCTL).
Seems to work ok on my system, but needs more testing (with lockdep) and
review from some fresh eyes.
2007-05-18 09:40:01 -07:00
d42c1de3fb
Change some printk's to DRM_DEBUG's
2007-05-18 14:16:27 +01:00
0c33a2cd2e
Move fbo creation to the specified fb driver which gives
...
it a chance to allocate the memory from whichever buffer it wants to.
2007-05-18 14:16:10 +01:00
315cf14af8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
shared-core/i915_dma.c
2007-05-18 13:48:56 +01:00
95945bbf22
Set crtcinfo on temporary mode
2007-05-17 23:33:48 +01:00
f3beabedc3
Remove unused edid.h header from X.Org.
2007-05-17 13:48:46 -07:00
c0479dad8e
bring in change from drm_fb.c
2007-05-17 19:32:46 +01:00
07a5fbaa61
Move destruction of crtc as intelfb_remove uses the crtc to locate the fb.
2007-05-17 19:28:03 +01:00
b7bf317f42
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
...
Conflicts:
linux-core/drm_crtc.c
linux-core/drm_fb.c
Lots of changes to merge with alanh's latest stuff:
o fix use of fb->pitch now that it has the right value
o add new helper for finding the CRTC given an FB
o fix new fb_probe/fb_remove functions to take a CRTC
o fixup callers of new FB routines
o port drm_fb changes to intel_fb
o check for errors after creating fb buffer object
o go back to using cfb_imageblit since the accel stubs aren't ready
2007-05-17 10:35:07 -07:00
fd63ea9713
Grab the default mode if the preferred mode isn't available.
...
Fix an overflow problem.
2007-05-17 17:00:11 +01:00
a18b4befb9
Fix FB pitch value (we had it wrong and were working around it in a few
...
places).
Add new FB hooks to the drm driver structure and make i915 use them for an
Intel specific FB driver. This will allow acceleration and better handling
of the command stream.
2007-05-17 09:00:06 -07:00
ea98d7e796
nouveau: don't build the module by default
2007-05-17 17:35:51 +02:00
2222bd767f
Fix build problem
2007-05-17 13:19:56 +01:00
5ce8aaae72
Large changes for fbdev support.
...
Change from DIRECTCOLOR to TRUECOLOR, and enable
support for PSEUDOCOLOR. DIRECTCOLOR support needs more work.
Add the ability to change the mode on the fbdev device.
Support depth 8, 15, 16 and 24 (and 32).
Add a /dev/fbX device per CRTC, but there's some code which
doesn't allocate the fbX device unless the output is actually
enabled. Read the code on this as it impacts the fbcon map flags.
Pick CRTC's based on the available outputs. More work could
be done here to match modes, so cloning could be achieved on
outputs. This fits more inline with what the X code does.
2007-05-17 12:46:36 +01:00
eba00df120
Just some minor cleanups.
2007-05-10 13:16:05 +01:00
b2a875ba89
ttm: complete drm buffer object ioctl split
...
retain the op operation for validate/fence operations
2007-05-08 18:25:15 +10:00
ae677472af
drm/ttm: remove old fence ioctl
2007-05-08 17:55:57 +10:00
25c51f539f
drm/ttm: ioctl cleanup for buffer object - user side only
...
This just cleans up the xf86drm.c to what I want and drm.h,
I need to fix up the kernel internals to suit these changes now.
I've moved to using struct instead of typedefs for the bo and it doesn't look
that bad so I'll do the same thing for mm and fence..
2007-05-08 17:53:58 +10:00
c4e2caec44
s/OJBECTS/OBJECTS/
2007-05-06 10:09:59 -06:00
6a62941eca
drm/ttm: cleanup most of fence ioctl split out
2007-05-06 11:35:11 +10:00
ee8954cb53
drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls.
...
This is the first bunch of ioctls
2007-05-06 11:17:30 +10:00
c9cd2c768b
drm: remove unused define DRM_HAS_TTM
2007-05-06 10:50:10 +10:00
3a69e2484a
cleanup usermodes on drm mode setting shutdown
2007-05-01 14:20:22 +10:00
89231953d1
Add support for user defined modes
...
This allows userspace to specify modes and add them to the modesetting
system and attach modes to outputs
2007-05-01 13:16:29 +10:00
8e8e37515e
fix unusued variable
2007-05-01 13:15:41 +10:00
6e860d08d0
drm: add new drm_wait_on function to replace macro
2007-04-28 15:07:43 +10:00
e9b3acd257
remove register usage
2007-04-28 15:07:43 +10:00
9f9c19065c
remove DRM_GETSAREA and replace with drm_getsarea function
2007-04-28 15:07:43 +10:00
3a2c9f4621
linux: minor indent.
2007-04-26 14:16:28 +03:00
afc029e935
whitespace cleanup
2007-04-26 16:25:43 +10:00
e5c1f1caa2
remove some whitespace violation
2007-04-26 16:22:28 +10:00
4b72759b30
drm: nopfn warning on 64-bit
2007-04-26 16:22:11 +10:00
71d44cda52
drm/ttm: allow drm_buffer_object_create to be used in-kernel
2007-04-26 16:09:24 +10:00
3c384a9ad5
Add new buffer object type for kernel allocations that don't initially have a user mapping.
...
(cherry picked from commit 2e21779992
2007-04-26 16:04:09 +10:00
b589b846e7
Merge branch 'origin' into modesetting-101
2007-04-26 15:56:21 +10:00
34be91fe4e
i915: fix vblank pipe setup
2007-04-26 14:50:00 +10:00
ceb44021ad
drm: make mode numbers no change by comparing probed modes
...
The mode list sets all the output modes to UNVERIFIED, then probes a new list,
If a mode is on the new list and not on the old, it adds it to the old,
if a mode is on the new list and old, it just updates the status to the new
mode status.
If a mode is on the old list and not on the new, prune invalid modes should
remove all UNVERIFIED modes
2007-04-23 11:42:29 +10:00
0f3c5148f0
fixup vrefresh reporting, it should now be *1000 in userspace
2007-04-23 09:10:46 +10:00
97b5599982
Oops, edid data should just be a char *, as edid.h is private to edid.c
...
(we can just recombine them now).
2007-04-20 18:00:44 -07:00
eb892fb09d
Add a monitor information structure separate from the EDID data for tracking
...
monitor limits, etc.
2007-04-20 17:59:30 -07:00
a21ff375c6
Document drm_modes.c functions.
2007-04-20 17:03:50 -07:00
9ca4932054
Add a mode name generation wrapper to make name format changes easier.
2007-04-20 16:32:58 -07:00
2d1de1fc6b
Initialize rwlock using rwlock_init to appease lockdep validator.
2007-04-20 18:12:18 -04:00
af3ffcd822
Initialize rwlock using rwlock_init to appease lockdep validator.
2007-04-20 18:06:31 -04:00
6238ebee21
Clean up and return if no outputs are found.
2007-04-20 16:52:04 -04:00
a8a8108e45
Avoid a fence timeout problem when a signal is pending.
2007-04-20 15:57:41 +02:00
1ce9c09231
Fix via compile error
...
(Reported by Benno Schulenberg.)
2007-04-20 15:49:31 +02:00
8d893e49ec
backout SDVO control bus check and comment why this is a bad idea
2007-04-19 09:43:46 +10:00
5587961cfe
Document main drm_crtc.c functions, and rename drm_crtc_mode_create to
...
drm_mode_create to be consistent with the other functions. Also document
where we need locking fixes and what the locks are for.
2007-04-18 11:49:42 -07:00
2df2c70e20
Simplify the ttm backend interface and the agp ttm backend.
2007-04-18 16:33:28 +02:00
dfc02547ff
Shouldn't free the mode here. It's done later on.
2007-04-18 14:18:56 +01:00
b642ced083
Fix return status
2007-04-18 13:52:46 +01:00
0207b51acc
Fix build problem
2007-04-18 12:19:16 +01:00
87b46bd436
free the duplicated mode.
2007-04-18 12:10:06 +01:00
191594ebd5
When no valid EDID modes are available, we bail.
...
This snippet adds a standard 640x480 @ 60Hz mode when
that occurs, so we can continue with a basic mode.
Should we do this here though ???
2007-04-18 12:07:55 +01:00
ef2bce3a16
Merge remote branch 'origin/modesetting-101' into modesetting-101
2007-04-18 11:55:09 +01:00
51e867c578
Support the RGB outputs of SDVO cards, which are essentially
...
VGA outs.
The drm_initial_config path has specific handling code to name
match for VGA, TMDS or LVDS. This is pretty restrictive and should
probably be dealt with to be more generic.
2007-04-18 11:53:25 +01:00
ea8bcb466b
Check status after SDVO command for sdvo_set_control_bus_switch
2007-04-18 11:47:21 +01:00
dc03e07f23
Move SDVO PENDING check to read_response so all SDVO commands
...
benefit from the spin loop.
2007-04-18 11:46:04 +01:00
20b2949e37
make sure TMDS gets a crtc
2007-04-18 14:55:43 +10:00
e46e028bd2
Merge branch 'origin' into modesetting-101
...
Conflicts:
linux-core/drm_bo.c
Merge in changes from master from Thomas fixiing TTM problems
2007-04-18 14:11:49 +10:00
c71c44bb92
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
2007-04-17 18:20:05 -07:00
4f0841a31c
Just use drm_output_destroy to cleanup LVDS failures. It'll call our cleanup
...
routine, which will take care of freeing our dev_priv and i2c ddc bus.
2007-04-17 18:03:14 -07:00
d20aaf4858
don't crash if no desired mode
2007-04-18 10:41:39 +10:00
2352ec9bfa
backout alanh's broken commit
2007-04-18 10:39:58 +10:00
7c9e19ba55
clean up ring buffer and TTM in i915_driver_unload
...
I've commented out the framebuffer for now
2007-04-18 10:39:27 +10:00
73b031df61
Add framebuffer bo freeing to drm_mode_config_cleanup (seems like the best
...
place for now).
2007-04-17 17:30:46 -07:00
a45fa264f2
Lvds now power up backlight on commit
...
Now saves previous power level in prepare and sets
that power level in commit, should power level
be 0 it will set maximum level.
2007-04-17 22:27:46 +02:00
1c7f895fa6
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
...
Conflicts:
shared-core/i915_init.c - reconcile with airlied's new code
2007-04-17 10:14:18 -07:00
4e4d9cbeb3
Move initial framebuffer allocation and configuration to drm_initial_config,
...
remove i915_driver_load fb related stuff. Add a small helper for setting up
outputs.
2007-04-17 10:00:37 -07:00
5e6c345396
Add prototypes for drm_bo_init_mm and drm_buffer_object_create for use by
...
in-kernel code.
2007-04-17 09:57:08 -07:00
b729b919ba
Fix a register read that was swapped SDVOB/SDVOC
...
Check for the PENDING message when reading the attached
displays. Ensures the command has completed before continuing.
(probably need to check PENDING in other SDVO calls too)
2007-04-17 16:11:00 +01:00
ecd9801c3c
Fix SDVO outputs
2007-04-17 16:09:40 +01:00
5a96d59ce9
Don't always free up memory space when we unpin buffers.
2007-04-17 14:15:37 +02:00
5432cc4abf
Fix buffer object reference problems.
...
(Reported by Dave Airlie).
2007-04-17 10:53:19 +02:00
1a5e647f63
I don't think this dec is necessary and my stuff all works without ..
...
with it everything falls over
2007-04-17 18:18:42 +10:00
56ef1ab8ac
add some missing export symbols
2007-04-17 18:18:25 +10:00
79aa1d5474
another large overhaul of interactions with userspace...
...
We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
2007-04-17 18:16:38 +10:00
e91ceff6c9
Add a code comment.
2007-04-17 08:46:45 +02:00
cd5769c3b5
Fix offset should from pci device address
2007-04-16 20:54:24 +02:00
e6e4946c82
Require the hardware lock for buffer creation
...
(since that implies a validate).
Fix drm_bo_wait_unfenced error messages and codes.
Fix some return codes from libdrm.
2007-04-16 16:23:05 +02:00
2aa183db1f
Use drm_mem_reg_ioremap to map buffer object.
2007-04-14 15:35:38 -07:00
65619cab27
Fix PRIV0 memory initialization (mm_init takes pages, not bytes), align fb
...
allocation correctly, and use drm_mem_reg_iomap to map ring buffer object.
2007-04-14 15:35:21 -07:00
c4e944182d
Added debug messages so we know which output we are dealing with
2007-04-13 10:13:25 +02:00
cc471a361f
i915/drm: clean up a lot of the i915/drm startup/teardown sequences
...
When the kernel driver is loaded it sets up a lot of stuff..
it tears down the same stuff on unload.
This add a new map type called DRM_DRIVER which means the driver will clean the mapping up
and fix up the map cleaner
2007-04-13 14:51:16 +10:00
27598bacfd
export drm_bo_driver_finish symbol
2007-04-13 14:50:31 +10:00
a890d596fc
revert LVDS destroy - this oops on sysfs on sdvo init of i2c bus
2007-04-13 14:50:31 +10:00
9f0f6509f5
Move driver load call to after AGP init, in case the load routine needs AGP stuff.
2007-04-12 18:30:36 -07:00
79b7a588bb
Oops, forgot to push the msleep() in the hotplug test. Wouldn't want to
...
spin in the kernel for a whole second w/o it...
2007-04-12 14:57:07 -07:00
9a39cb9b9a
Use crtc_from_pipe call in intel_lvds.c and add get_mode panel mode detection. Also fix up error case for when LVDS mode can't be determined. Leave placeholder code in place for BIOS mode probing and platform quirks.
2007-04-12 12:43:47 -07:00
6b229c1e59
Add new function for getting a CRTC pointer given a pipe number.
2007-04-12 12:41:56 -07:00
9e5d61d5b8
Fix 945+ hotplug detection, remove some unused variables.
2007-04-12 12:40:51 -07:00
fb3c82f1d8
Don't need a NULL check prior to calling kfree.
2007-04-12 11:50:57 -07:00
c2fce380c2
Move i2c init back to where it belongs and add i2c unregistration in *_destroy.
2007-04-12 08:57:58 -07:00
258e1cf703
Whitespace cleanup
2007-04-12 08:56:34 -07:00
e7b97f5523
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
2007-04-12 08:55:51 -07:00
f2e3d790ac
Revert "Export drm_setup for use by new driver init code.", we don't really want to use this function
...
This reverts commit e114b981bc
2007-04-12 08:53:03 -07:00
cf01689143
Use drm_framebuffer instead of drm_crtc for fb & fbt
2007-04-12 15:12:00 +01:00
a85440c8a6
Remove extraneous drm_crtc.h include
2007-04-12 15:11:38 +01:00
9420ab4b41
Merge remote branch 'origin/modesetting-101' into modesetting-101
2007-04-12 15:10:08 +01:00
1bba3cb3b3
cleanup framebuffers on drm unload
2007-04-12 11:55:10 +10:00
fb6c5aacb9
only initialise modes when fbcon or fbset asks for it
2007-04-12 11:54:49 +10:00
b49b3ba4c1
set bracing style like Linux
2007-04-12 11:43:13 +10:00
a5cf4cc369
fix unbalanced lock and make sure mode list has modes so lvds code doesn't crash
2007-04-12 11:28:55 +10:00
981f8156de
allow framebuffer changes on the crtc setup
2007-04-12 08:54:31 +10:00
a81558d8b3
add getfb ioctl
2007-04-12 08:45:40 +10:00
2e21779992
Add new buffer object type for kernel allocations that don't initially have a user mapping.
2007-04-11 12:51:52 -07:00
63d4d40463
Fix i2c unregistration, cleanup panel_fixed_mode assignment.
2007-04-11 11:46:37 -07:00
425da42e95
Whitespace cleanups.
2007-04-11 11:44:54 -07:00
c731b68091
Fix EDID pixel clock calculation.
2007-04-11 11:42:00 -07:00
cc7faa4de8
fix modeset cleanup for LVDS and reenable it in i915.
2007-04-11 07:21:24 -07:00
dd00aa5851
export vblank routine for use by intel_display.c and intel_sdvo.c.
2007-04-11 07:08:48 -07:00
f35db66906
Fixup DDC probing. We only have one DDC bus so we have to use it only
...
on demand, and unregister when we're done.
2007-04-11 07:08:29 -07:00
78598fdaa8
Various changes for in-kernel modesetting:
...
- allow drm_buffer_object_create to be called w/o dev_mapping
- fixup i915 init code to allocate memory, fb and set modes right
- pass fb to drm_initial_config for setup
- change some debug output to make it easier to spot
- fixup lvds code to use DDC probing correctly
2007-04-11 07:07:54 -07:00
7e48d47fb5
line_length calculation was incorrect.. I now can get fbcon to run
2007-04-11 17:35:00 +10:00
0392badd84
oops for 32 pitch.. hey I can see stuff on fbcon now.. it looks like text.. just a bit garbled
2007-04-11 17:25:37 +10:00
1147fefed8
fixup framebuffer depth
2007-04-11 17:13:57 +10:00
a6cc6a778f
add support for setting a framebuffer depth
2007-04-11 17:13:45 +10:00
c582eaac19
add copyright statement
2007-04-11 16:34:40 +10:00
32f6a58db2
add initial drm_fb framebuffer
...
So far I can load fbcon, once I use my miniglx to add a framebuffer.
fbcon doesn't show anything on screen but baby steps and all that.
2007-04-11 16:33:03 +10:00
9d12da5917
only bo finish at driver unload
2007-04-11 14:34:22 +10:00
7e58276c76
Revert "Remove some delays from Intel i2c code, we'll need a more comprehensive fix"
...
This reverts commit c033698988
2007-04-11 13:40:50 +10:00
44be9c9d59
add an fb count + id get to the get resources code path
2007-04-11 13:26:21 +10:00
3e994a56be
use fb pitch and fix up some whitespace
2007-04-11 13:26:21 +10:00
f50eec752c
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
2007-04-10 17:58:30 -07:00
b62ffb8e91
fixup calculation to make sdvo work
2007-04-11 09:56:09 +10:00
44a8761302
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
...
Conflicts:
linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
2007-04-10 10:45:55 -07:00
e114b981bc
Export drm_setup for use by new driver init code.
2007-04-10 10:31:58 -07:00
b59285d738
Move i915 init code to new file, i915_init.c, and create a new high level
...
init routine that runs at driver load time.
2007-04-10 10:31:10 -07:00
8785679f89
Remove some debug #if 0 codes and add a reminder to check locking around
...
output enumeration stuff.
2007-04-10 09:49:02 -07:00
c033698988
Remove some delays from Intel i2c code, we'll need a more comprehensive fix
...
in the Linux i2c layer to make DDC reliable on old monitors.
2007-04-10 09:48:20 -07:00
183cbd92dd
Finish bringing in LVDS code, re-add to Makefile. Needed other changes too:
...
- move EDID structures to drm_edid.h
- add EDID info structure to drm_output
- add a few routines to intel_display for getting current mode info
- add some prototypes to intel_drv.h and drm_crtc.h
2007-04-10 09:47:37 -07:00
50672adb31
add sdvo debugging output
2007-04-10 16:49:36 +10:00
b9c7fa55e2
fixup sarea writes for set pipe base and dpms
2007-04-10 16:32:17 +10:00
23a66fd506
fixup true/false in intel_sdvo.c
2007-04-10 16:26:07 +10:00
f1476e4e5c
re-tab and fixup the i915GM get core clock function to actually work
2007-04-10 16:25:52 +10:00
1e39dc4323
export output name to userspace
2007-04-10 16:25:31 +10:00
40bd6dcd86
set the base address of the CRTC correctly
2007-04-10 15:20:50 +10:00
65f465ed5a
fixup numerous issues with adding framebuffer support
...
This still isn't perfect but it fixes a few oopses and cleans up
some of the tabs and bugs in the original fb limit code
2007-04-10 14:49:49 +10:00
c446bf50e3
Slam in most of X.Org's i830_lvds (not quite done yet so removed from Makefile.kernel too).
2007-04-09 20:46:38 -07:00
eb9bdc2787
mode: fixup problems with framebuffer add function
2007-04-10 11:51:31 +10:00
ed0ebd9d3d
make crtc_config be named mode_config
...
X.org calls this crtc_config but this is a bad name and will confuse ppl later
(and me now :-)
2007-04-10 18:56:02 +10:00
b50bda002b
add addfb/rmfb ioctls
...
Originally from Jakob, cleaned up by airlied.
2007-04-10 18:44:47 +10:00
7e2b1a6cf5
Fix refresh calculation (mistakenly removed 1000 factor needed for integer calulations, fixed mode printout debugging routine instead).
2007-04-09 08:52:53 -07:00
a70f8e0ab2
radeon: add support for reverse engineered xpress200m
...
The IGPGART setup code was traced using mmio-trace on fglrx by myself
and Phillip Ezolt <phillipezolt@gmail.com> on dri-devel.
This code doesn't let the 3D driver work properly as the card has no
vertex shader support.
Thanks to Matthew Garrett + Ubuntu for providing me some hardware to do this
work on.
2007-04-09 21:52:59 +10:00
ab7ee9c1af
remove a printk to make things less verbose
2007-04-07 19:26:55 -07:00
2430d0c315
just codingstyle cleanups
2007-04-07 19:25:25 -07:00
491ed9e4c2
document drm_mode_duplicate and fix vrefresh calculation (off by 1000 error)
2007-04-07 19:24:53 -07:00
13d4ea90c0
various cleanups to EDID code:
...
- pull in FB DDC code (we'll have to rewrite it anyway it appears)
- add comments
- note a few FIXMEs
- make it less quiet, and more informative when it actually does print
2007-04-07 19:24:09 -07:00
a35ba455b2
make drmP.h include drm_crtc.h for CRTC related stuff.
...
fixup drm_crtc.c so it matches VGA and other outputs properly.
make drm_crtc.c less verbose.
add function declarations in drm_crtc.h for other files.
2007-04-07 19:22:39 -07:00
b25558bb73
fixup install target, not sure what I was smokin...
2007-04-07 07:21:05 +10:00
1c9ba24c2f
Add required permission notices for code copied from X.Org source.
2007-04-05 11:34:11 -07:00
50ee722e01
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
2007-04-05 09:27:12 -07:00
6f3534a13a
Add copyrights before I forget
2007-04-05 09:21:31 -07:00
652bbb77f6
add back compat for bool
2007-04-05 20:20:33 +10:00
b4094864f1
checkpoint commit: implement SetCrtc so modes can in theory be set from user
...
This hooks up the userspace mode set it "seems" to work.
2007-04-05 18:01:02 +10:00
7bb112feca
checkpoint commit: added getresources, crtc and output
...
This adds the user interfaces from Jakob and hooks them up for 3 ioctls
GetResources, GetCrtc and GetOutput.
I've made the ids for everything fbs, crtcs, outputs and modes go via idr as
per krh's suggestion on irc as it make the code nice and consistent.
2007-04-05 17:06:42 +10:00
5bffbd6e27
initial userspace interface to get modes
2007-04-05 13:34:50 +10:00
52f9028c84
Initial import of modesetting for intel driver in DRM
2007-04-05 11:21:06 +10:00
8fe8793a0f
borrow edid.h from fb directory
2007-04-05 11:20:23 +10:00
9c79371659
add an install target to the drm modules makefile
2007-04-05 11:18:00 +10:00
c496827921
Fix user object reference when caller is not object creator.
...
(Reported by Dave Airlie).
2007-04-03 10:54:23 +02:00
38d18acb8f
Add a fence flush event to each fence-signaled check when lazy-waiting
...
to make sure we don't lose any sequence numbers if, for some reason,
they don't generate an IRQ.
2007-04-03 10:29:15 +02:00
7743af9449
Evicted no-move buffers can get lost if they end up in another
...
memory type than local.
2007-04-03 10:29:14 +02:00
d85e243259
Fix an oops when trying to clean a not yet initialized memory type.
2007-04-03 10:29:14 +02:00
72d457fc19
Make sure CMA (Can't map aperture) pages are mapped uncached.
...
(Should really make this write-combined using PATs, at some point).
2007-04-03 10:29:14 +02:00
3f70518f0b
drm/bo: avoid oops if the memory manager for this type isn't initialised
2007-03-29 09:25:04 +10:00
81b811da37
drm/i915: set the bo up at firstopen time not after DMA init
...
This is required to use TTM to allocate the ring buffer.
2007-03-27 18:01:31 +10:00
72a1190f6d
drm/ttm: make sure dev_mapping is set-up for the first opener of the drm
...
This was causing an oops in my miniglx code to try and use a TTM-only setup.
2007-03-27 17:59:30 +10:00
674cefd4fe
nouveau: move card initialisation into the drm
...
The PGRAPH init for the various cards will need cleaning up at some point,
a lot of the values written there are per-context state left over from the
all the hardcoding done in the ddx.
It's possible some cards get broken by this commit, let me know.
Tested on: NV5, NV18, NV28, NV35, NV40, NV4E
2007-03-26 20:59:37 +10:00
5ad43f4675
vm: cleanup drm_vm.c along lines of cleanups queued for kernel
2007-03-24 17:58:27 +11:00
8d918b0b63
cleanup more whitespace from ttm merge
2007-03-23 14:56:39 +11:00
39795501a8
drm: remove second spinlock init for tasklet lock
2007-03-23 14:56:28 +11:00
209870a882
rename badly named define
2007-03-20 10:13:58 +11:00
ef71b6230b
remove i830 reference
2007-03-19 11:46:35 +00:00
cbe31d0dc7
Remove old i830 kernel driver.
2007-03-19 11:46:35 +00:00
1e77e52755
more return values fixup
2007-03-19 09:20:04 +11:00
46fac17082
fixup return values in drm ioctl
2007-03-19 09:12:08 +11:00
c991f8e049
cleanup ioctl expansion code
2007-03-19 08:46:39 +11:00
a2e3bae8e2
oops missing else
2007-03-19 08:46:25 +11:00
bbb6fc9307
make drm fops const from kernel
2007-03-19 08:36:01 +11:00
483f6a113d
use ARRAY_SIZE
2007-03-19 08:32:25 +11:00
2d7ecb8422
more tab/space conversion
2007-03-19 08:29:07 +11:00
2463b03cb4
whitespace cleanup pending a kernel merge
2007-03-19 08:23:43 +11:00
6c4428d40c
clean up more of inline functions agp_remap/drm_lookup_map
2007-03-19 08:09:21 +11:00
27197d7836
deinline agp_remap along lines of kernel
2007-03-18 21:45:07 +11:00
c4808e206b
remove drm_lookup_map unused now
2007-03-18 21:42:48 +11:00
6a60b47d12
replace instance of SA_SHIRQ with IRQF_SHARED
...
backwards compat added by airlied
2007-03-11 12:13:58 +11:00
c9178c3d01
ati: make pcigart code able to handle variable size PCI GART aperture
...
This code doesn't enable a variable aperture it just modifies the codebase
to allow me fix it up later
2007-03-04 18:16:29 +11:00
6a51da7325
Fix Alpha domain/bus issue
2007-02-27 08:56:20 +00:00
80468e7532
Fix build for 2.6.21-rc1.
...
The vm subsystem of 2.6.21 is fully compatible with the buffer object
vm code.
2007-02-26 18:17:54 +01:00
2b7a9afa09
Some fencing cleanup.
2007-02-22 17:04:20 +01:00
a253de2fcf
drm: remove last usage of VM_OFFSET
2007-02-18 17:59:40 +11:00
6d8ed5aedd
Leftover files from previous commit.
2007-02-16 20:25:26 +01:00
e0f53e59be
Simple fence object sample driver for via, based on idling the GPU.
...
Buffer object driver for via.
Some changes to buffer object driver callbacks.
Improve fence flushing.
2007-02-16 20:22:24 +01:00
7766378d97
Initial support for fence object classes.
...
(Fence objects belonging to different command submission mechanisms).
2007-02-15 12:11:38 +01:00
7803977aa9
Fix build against older kernels.
2007-02-15 09:26:16 +01:00
a78f70faad
Merge branch 'ttm-vram-0-1-branch'
2007-02-14 15:33:40 +01:00
35eb12d8bf
Fix multiple spinlock unlocking
2007-02-14 15:32:08 +01:00
1345076c8f
Rename drm_ttm.h to drm_objects.h
...
Fix up some header incompatibilities in drm_fence.c caused by the previous
commit.
2007-02-14 14:10:10 +01:00
8ffc1844b0
Move fence- and buffer-object related header stuff to drm_ttm.h
2007-02-14 14:05:40 +01:00
5c9a7b0f94
Remove an intel-specific hack and replace it with a fence driver callback.
2007-02-14 13:31:35 +01:00
04760563b8
Set the drm bus map type for each buffer object memory type.
2007-02-14 12:39:02 +01:00
7bcb62b45d
Rework buffer object vm code to use nopfn() for kernels >= 2.6.19.
2007-02-14 10:49:37 +01:00
6b289db054
Remove debug printout.
2007-02-13 20:47:30 +01:00
e1460426b8
Bugzilla Bug #9457
...
Add refcounting of user waiters to the DRM hardware lock, so that we can use the
DRM_LOCK_CONT flag more conservatively.
Also add a kernel waiter refcount that if nonzero transfers the lock for the kernel context,
when it is released. This is useful when waiting for idle and can be used
for very simple fence object driver implementations for the new memory manager.
It also resolves the AIGLX startup deadlock for the sis and the via drivers.
i810, i830 still require that the hardware lock is really taken so the deadlock remains
for those two. I'm not sure about ffb. Anyone familiar with that code?
2007-02-13 20:47:30 +01:00
9efdae317c
More bugfixes.
...
Fixed memory, pinned buffers and unmappable memory now seems
fully functional.
2007-02-13 20:05:32 +01:00
5bd13c5e15
Fix some outdated URLs, remove others.
2007-02-12 15:45:51 -05:00
398913dc0e
Lindent.
2007-02-12 20:34:50 +01:00
b0c5339ed6
More bugfixes.
2007-02-12 20:32:03 +01:00
f02f83ee08
Cleanup and fix support for pinned buffers.
2007-02-12 17:47:57 +01:00
85ee2a8d04
Various bugfixes.
2007-02-10 12:06:36 +01:00
53aee3122a
I915 accelerated blit copy functional.
...
Fixed - to System memory copies are implemented by
flipping in a cache-coherent TTM,
blitting to it, and then flipping it out.
2007-02-09 16:36:53 +01:00
57df398072
Reinstate some LRU handling.
2007-02-09 12:43:18 +01:00
d32b21e016
Remove some code that should have gone in
...
commit 6a49d9a8ab
2007-02-09 00:11:53 +01:00
99acdaee48
Fix copyright statements.
2007-02-09 00:07:29 +01:00
6a49d9a8ab
Fix evict_mutex locking range.
...
Implement unmappable buffers. (fault moves them to mappable when needed).
Various bugfixes.
2007-02-09 00:02:02 +01:00
b2bcbf874b
Add an accelerated buffer copy cleanup helper.
...
Export helper functions and make some important buffer-object functions non-static.
Add an i915 accelerated blit buffer move for pci memory buffers.
2007-02-08 21:28:33 +01:00
a0ed808d05
Don't create a ttm just to copy from.
2007-02-08 19:06:39 +01:00
bf8f46d4c6
Fix mm_block leak.
...
Some other minor fixes.
2007-02-08 18:59:02 +01:00
e4b2da4406
A minor function interface change and some memcpy bugfixing.
...
Hooray!! it sort of works with a fixed AGP area as faked VRAM.
2007-02-08 16:21:38 +01:00
1257907fa9
Simplify external ttm page allocation.
...
Implement a memcpy fallback for copying between buffers.
2007-02-08 13:29:08 +01:00
09984ad77b
Update memory compatibility tests.
...
Now only pinned buffers are broken.
2007-02-08 11:55:24 +01:00
c1fbd8a566
Checkpoint commit.
...
Flag handling and memory type selection cleanup.
glxgears won't start.
2007-02-07 17:25:13 +01:00
af24465b2e
Fix a stray unlock_kernel() in drm_vm.c
...
Add a file for memory move helpers, drm_bo_move.c
Implement generic memory move.
Cached, no_move and unmapped memory temporarily broken.
2007-02-07 12:52:23 +01:00
71b9e876f9
Simplify pci map vs no pci map choice.
2007-02-06 16:59:45 +01:00
40ce53dfde
Implement a drm_mem_reg_t substructure in the buffer object type.
2007-02-06 15:56:43 +01:00
609e3b0375
Implement a policy for selecting memory types.
2007-02-06 14:20:33 +01:00
2d962332de
i915: Add copy-blit operation.
2007-02-05 16:13:32 +01:00
ebf22aed9a
nouveau: add missing nv04_graph.c symlink.
2007-02-03 06:02:12 +01:00
d69902db3b
nouveau: fix nv04 graph routines for new register names.
2007-02-03 05:25:36 +01:00
63f2abd721
Make also later kernels work with buffer object vm
...
and clean up some function names.
2007-02-02 19:49:11 +01:00
c269d560e4
Make vm handle buffer objects instead of ttm objects.
...
Remove ttm objects.
Make vm aware of PCI memory type buffer objects.
(Only works for pre 2.6.16 kernels for now).
2007-02-02 14:47:44 +01:00
dd733dea38
Fix missing ttm_open_vma call from previous commit.
...
Honour the ttm backend cant-use-aperture flag.
2007-02-01 13:19:05 +01:00
9677c5ecc6
Prepare for removal of the ttm_object type.
2007-02-01 10:53:55 +01:00
333c6af47a
Protect drm_mmap against disappearing maps.
...
The map lists and hash tables are protected using dev->struct_mutex,
but drm_mmap strangely never locked this mutex.
2007-02-01 00:38:57 +01:00
3024f23c65
memory manager: Make device driver aware of different memory types.
...
Memory types are either fixed (on-card or pre-bound AGP) or not fixed
(dynamically bound) to an aperture. They also carry information about:
1) Whether they can be mapped cached.
2) Whether they are at all mappable.
3) Whether they need an ioremap to be accessible from kernel space.
In this way VRAM memory and, for example, pre-bound AGP appear
identical to the memory manager.
This also makes support for unmappable VRAM simple to implement.
2007-01-31 14:50:57 +01:00
36d50687dd
Fix an error-path oops.
2007-01-31 11:03:53 +01:00
d399fcf46f
Add a buffer object transfer function.
...
Creates a placeholder for the old buffer contents
when it is transfered to / from static memory like VRAM.
2007-01-30 16:20:23 +01:00
9bbdc0fb10
Clean up buffer object destruction somewhat.
2007-01-30 12:35:49 +01:00
9a654e71bd
Use pre-defined list_splice function.
2007-01-29 13:37:02 +01:00
45418bb1b1
s/buf/bo/ for consistency.
2007-01-29 13:37:02 +01:00
1e4c7d69f5
Some cleanup. A buffer object should only have one active memory type.
2007-01-29 13:37:02 +01:00
582637641a
Remove a scary error printed when we were leaking memory caches.
...
We don't use memory caches anymore...
Fix memory accounting initialization to only use low or DMA32 memory.
2007-01-25 14:27:29 +01:00
f04347f371
nouveau: nv20 graph ctx switch.
...
Untested...
2007-01-13 23:19:41 +01:00
cd5f543b2f
nouveau: first step to make graph ctx works
...
It is still not working, but now we could use some 3D commands
without needed to run nvidia blob before.
2007-01-13 21:44:50 +01:00
69a98d89d5
nouveau: add missing symlink
2007-01-13 08:43:15 +11:00
4297a83b48
nouveau: get nv30 context switching to work.
...
* Pulled in some registers from nv10reg.h. Needed for context switching.
* Filled in nv30 graphics context (based on nv40_graph.c).
* Figure out nv30 context table, set up on context creation. Allows the cards automatic switching to work.
2007-01-12 00:14:54 -05:00
125f3ff367
Revert "nouveau: Fill in context_init for nv10-nv3x."
...
This reverts ac076cb9af
2007-01-10 15:19:47 +11:00
ac076cb9af
nouveau: Fill in context_init for nv10-nv3x.
...
Fill in the context with the values from PFIFO_CACH1. This should work from nv10 through the nv30 series.
2007-01-09 23:12:37 -05:00
ec12209c76
nouveau: Don't use DRIVER_USE_MTRR, we already setup our own mtrr over vram.
2007-01-10 04:42:09 +01:00
f6ba3b2603
ttm: make ttm alloc/free into alloc_pages/free_pages
...
Add a vmalloc flag to the page flags
2007-01-09 15:51:29 +11:00
22821cf01d
add export symbol for memory manager
2007-01-08 22:27:27 +11:00
5bf60c9d6c
i830: complete fix for i830 maps
2007-01-08 13:09:51 +11:00
b147c39263
drm: remove drm_follow_page, and drm_ioremap and ioremapfree
...
This comes from the Re: [patch] paravirt: isolate module ops on lkml
It needs some testing, please report any regressions caused.
Signed-off-by: Dave Airlie <airlied@linux.ie>
2007-01-08 11:47:15 +11:00
fe5770b89e
fixup i810/i830 to use drm_core_ioremap instead of drm_ioremap
2007-01-08 11:46:54 +11:00
025f281bbf
nouveau: Add an mtrr over the whole FB
2007-01-05 20:49:34 +01:00
972074b5d6
linux-core: Make git ignore generated module symbol version files.
2007-01-02 10:02:44 +01:00
0e0d954584
nouveau: Add nv40-specific PGRAPH code, not hooked up yet.
2007-01-02 14:52:43 +11:00
2dcbf6a599
make build against 2.6.20 hopefully
2007-01-01 11:30:38 +11:00
87faf62fae
fixup permission along line of kernel
2007-01-01 11:22:35 +11:00
975136d6e5
Proper allocation of AGP pages for ttms.
2006-12-27 15:32:09 +01:00
72cb361c5c
Bug #9120 .
...
Require at least agpgart version 0.102 for the AGP TTM backend.
This should hopefully avoid crashes when the wrong agpgart
driver is installed.
2006-12-21 12:05:49 +01:00
ae58225613
Improve memory manager accounting printout formatting.
2006-12-21 10:43:47 +01:00
a467d24829
Fix buggy aligned allocations.
2006-12-21 10:43:46 +01:00
9acd4a13f2
Remove the stupid root_node field from the core memory manager.
2006-12-20 19:33:50 +01:00
672593f611
Replace vmalloc_32.
...
The vmalloc_32 function together with the memset to clear
the new pages are replaced with a vmalloc_user.
A pre-2.6.18 compat vmalloc_user is added.
Please replace any breakage on machines with > 1GB of memory.
2006-12-20 14:40:36 +01:00
3b47b27558
Some via PCI posting flushes.
2006-12-20 13:04:21 +01:00
e5c4a26a29
Merge branch 'nouveau-1'
2006-12-20 10:30:16 +11:00
dc1b68aacb
fixup symlinks via Makefile
2006-12-20 10:29:43 +11:00
744f9ac9c7
add nouveau symlinks via git
2006-12-20 10:28:55 +11:00
3b8e6ccd25
Security fix. Zero pages before they are handed to user space.
...
TTM pages were not cleared when allocated and handed to user space.
Sensitive information may leak.
2006-12-19 23:45:59 +01:00
72b5d1507a
Security fix. Zero pages before they are handed to user space.
...
Shared memory areas were not cleared when they are allocated and
handed to user space. Sensitive information may leak.
2006-12-19 23:23:17 +01:00
81251bf78f
Reclaim buffers locked fixup.
...
Avoid calling reclaim_buffers_locked if we don't have a
hardware lock.
Improve reclaim_buffers_locked deadlock error formatting.
2006-12-19 23:14:11 +01:00
737c73d1a0
add kcalloc compat for before 2.6.10
2006-12-19 22:10:34 +11:00
bc4c835731
remove do munmap 4 args
2006-12-19 21:51:30 +11:00
6333bfdb58
fixup inclusion of agp.h
2006-12-19 21:37:50 +11:00
Thomas Hellstrom
Dave Airlie
Michel Dänzer
Jesse Barnes
Alan Hourihane
Stephane Marchesin
root
Brian
George Sapountzis
Kristian Høgsberg
Dave Airlie
David Airlie
Jakob Bornecrantz
root
Eric Anholt
Jesse Barnes
Ben Skeggs
Maarten Maathuis
Jay Estabrook
Adam Jackson
Thomas Hellstrom
Matthieu Castet
Jeremy Kolb
Christoph Hellwig
Dave Airlie
Ben Skeggs
Dave Airlie