Jesse Barnes [Wed, 23 May 2007 00:49:04 +0000 (17:49 -0700)]
Suspend/resume support (incomplete).
Jesse Barnes [Tue, 22 May 2007 20:38:58 +0000 (13:38 -0700)]
Call preallocated space VRAM instead of PRIV0 to be more consistent with
other drivers.
Jesse Barnes [Fri, 18 May 2007 16:42:51 +0000 (09:42 -0700)]
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
Jesse Barnes [Fri, 18 May 2007 16:40:01 +0000 (09:40 -0700)]
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.
Alan Hourihane [Fri, 18 May 2007 13:16:27 +0000 (14:16 +0100)]
Change some printk's to DRM_DEBUG's
Alan Hourihane [Fri, 18 May 2007 13:16:10 +0000 (14:16 +0100)]
Move fbo creation to the specified fb driver which gives
it a chance to allocate the memory from whichever buffer it wants to.
Alan Hourihane [Fri, 18 May 2007 12:59:46 +0000 (13:59 +0100)]
Fix merge problem.
Alan Hourihane [Fri, 18 May 2007 12:48:56 +0000 (13:48 +0100)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
Alan Hourihane [Thu, 17 May 2007 22:33:48 +0000 (23:33 +0100)]
Set crtcinfo on temporary mode
Jesse Barnes [Thu, 17 May 2007 20:48:46 +0000 (13:48 -0700)]
Remove unused edid.h header from X.Org.
Alan Hourihane [Thu, 17 May 2007 18:32:46 +0000 (19:32 +0100)]
bring in change from drm_fb.c
Alan Hourihane [Thu, 17 May 2007 18:28:03 +0000 (19:28 +0100)]
Move destruction of crtc as intelfb_remove uses the crtc to locate the fb.
Jesse Barnes [Thu, 17 May 2007 17:35:07 +0000 (10:35 -0700)]
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
Alan Hourihane [Thu, 17 May 2007 16:00:11 +0000 (17:00 +0100)]
Grab the default mode if the preferred mode isn't available.
Fix an overflow problem.
Jesse Barnes [Thu, 17 May 2007 16:00:06 +0000 (09:00 -0700)]
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.
Stephane Marchesin [Thu, 17 May 2007 15:35:14 +0000 (17:35 +0200)]
nouveau: don't build the module by default
Alan Hourihane [Thu, 17 May 2007 12:19:56 +0000 (13:19 +0100)]
Fix build problem
root [Thu, 17 May 2007 11:46:36 +0000 (12:46 +0100)]
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.
Oliver McFadden [Sun, 13 May 2007 16:18:54 +0000 (16:18 +0000)]
r300: Added my comments into r300_reg.h.
Oliver McFadden [Sun, 13 May 2007 07:53:40 +0000 (07:53 +0000)]
r300: Synchronized R300 register defines file.
Just moved the indent control comments so that indent doesn't try to change
anything.
Matthieu Castet [Sat, 12 May 2007 13:35:39 +0000 (15:35 +0200)]
nouveau : nv10 graph move clipping value to per channel init
Matthieu Castet [Sat, 12 May 2007 13:16:37 +0000 (15:16 +0200)]
nouveau : nv10 graph clipping values were forgoten in ddx to drm commit
Keith Packard [Mon, 7 May 2007 13:07:48 +0000 (09:07 -0400)]
Allow vblank interrupts to remain disabled across VT switch.
i915_driver_irq_postinstall was forcing vblank interrupts to pipe A when
called with vblank interrupts disabled. This caused vblank interrupts to be
accidentally re-enabled when VT switching the X server. Instead, start the
driver with vblank interrupts enabled on pipe A to support older X servers,
but then leave control over the state to the X server if it is able to do so.
Alan Hourihane [Thu, 10 May 2007 12:16:05 +0000 (13:16 +0100)]
Just some minor cleanups.
Oliver McFadden [Wed, 9 May 2007 18:31:31 +0000 (18:31 +0000)]
r300: Synchronized R300 register defines file.
Oliver McFadden [Wed, 9 May 2007 15:22:09 +0000 (15:22 +0000)]
r300: Synchronized R300 register defines file.
Matthieu Castet [Tue, 8 May 2007 19:18:02 +0000 (21:18 +0200)]
nouveau : fix fifo context size for nv10
Dave Airlie [Tue, 8 May 2007 07:51:21 +0000 (17:51 +1000)]
libdrm: fix typo on ttm fence interface
Brian [Sun, 6 May 2007 16:09:59 +0000 (10:09 -0600)]
s/OJBECTS/OBJECTS/
Oliver McFadden [Sun, 6 May 2007 12:47:03 +0000 (12:47 +0000)]
r300: Synchronize the register file from Mesa.
Oliver McFadden [Sun, 6 May 2007 12:35:16 +0000 (12:35 +0000)]
r300: Use the defined names for known registers.
Dave Airlie [Sun, 6 May 2007 00:50:10 +0000 (10:50 +1000)]
drm: remove unused define DRM_HAS_TTM
Jakob Bornecrantz [Sat, 5 May 2007 14:08:27 +0000 (16:08 +0200)]
Cleaned up userspace interface for modesetting.
Thomas Hellstrom [Wed, 2 May 2007 15:13:32 +0000 (17:13 +0200)]
Fix buffer object list freeing.
Michel Dänzer [Tue, 1 May 2007 15:03:55 +0000 (17:03 +0200)]
Dave Airlie [Tue, 1 May 2007 04:20:22 +0000 (14:20 +1000)]
cleanup usermodes on drm mode setting shutdown
Dave Airlie [Tue, 1 May 2007 03:16:29 +0000 (13:16 +1000)]
Add support for user defined modes
This allows userspace to specify modes and add them to the modesetting
system and attach modes to outputs
Dave Airlie [Tue, 1 May 2007 03:15:41 +0000 (13:15 +1000)]
fix unusued variable
Michel Dänzer [Sun, 29 Apr 2007 10:17:57 +0000 (12:17 +0200)]
radeon: Don't mess up page flipping when a file descriptor is closed.
There can still be other contexts that may use page flipping later on, so don't
just unilaterally 'clean it up', which could lead to the wrong page being
displayed, e.g. when running 3D apps with a GLX compositing manager such as
compiz using page flipping.
Dave Airlie [Sat, 28 Apr 2007 05:07:22 +0000 (15:07 +1000)]
move i915 to new drm_wait_on function
Dave Airlie [Sat, 28 Apr 2007 05:05:20 +0000 (15:05 +1000)]
drm: add new drm_wait_on function to replace macro
Dave Airlie [Sat, 28 Apr 2007 05:04:49 +0000 (15:04 +1000)]
remove register usage
Dave Airlie [Sat, 28 Apr 2007 04:49:27 +0000 (14:49 +1000)]
remove DRM_GETSAREA and replace with drm_getsarea function
George Sapountzis [Thu, 26 Apr 2007 11:16:51 +0000 (14:16 +0300)]
Revert "bug 7092 : add pci ids for mach64 in Dell poweredge 4200"
This reverts commit
255f3e6f76dfd267a14765dd1293229184298d89.
Rage IIc does not have a vertex setup engine.
George Sapountzis [Thu, 26 Apr 2007 11:16:28 +0000 (14:16 +0300)]
linux: minor indent.
George Sapountzis [Thu, 26 Apr 2007 11:16:13 +0000 (14:16 +0300)]
freebsd: remove stray apperance of IN_MODULE.
The xserver no longer uses the libc-wrapper.
George Sapountzis [Thu, 26 Apr 2007 11:15:55 +0000 (14:15 +0300)]
libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's.
We no longer import libdrm in the xserver.
Dave Airlie [Thu, 26 Apr 2007 07:54:06 +0000 (17:54 +1000)]
update create_lk_drm.sh script
Dave Airlie [Thu, 26 Apr 2007 06:25:43 +0000 (16:25 +1000)]
whitespace cleanup
Dave Airlie [Thu, 26 Apr 2007 06:22:28 +0000 (16:22 +1000)]
remove some whitespace violation
Dave Airlie [Thu, 26 Apr 2007 06:22:11 +0000 (16:22 +1000)]
drm: nopfn warning on 64-bit
Jesse Barnes [Thu, 26 Apr 2007 06:09:24 +0000 (16:09 +1000)]
drm/ttm: allow drm_buffer_object_create to be used in-kernel
Jesse Barnes [Wed, 11 Apr 2007 19:51:52 +0000 (12:51 -0700)]
Add new buffer object type for kernel allocations that don't initially have a user mapping.
(cherry picked from commit
2e21779992bd5026d8ec4dea52466377dbe5a0ed)
Dave Airlie [Thu, 26 Apr 2007 05:56:21 +0000 (15:56 +1000)]
Merge branch 'origin' into modesetting-101
Dave Airlie [Thu, 26 Apr 2007 04:50:00 +0000 (14:50 +1000)]
i915: fix vblank pipe setup
Brian [Wed, 25 Apr 2007 20:52:29 +0000 (14:52 -0600)]
More detailed instructions, tips.
Stephane Marchesin [Mon, 23 Apr 2007 20:37:01 +0000 (22:37 +0200)]
nouveau: fix wacky pci id
Dave Airlie [Mon, 23 Apr 2007 01:42:29 +0000 (11:42 +1000)]
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
Dave Airlie [Sun, 22 Apr 2007 23:10:46 +0000 (09:10 +1000)]
fixup vrefresh reporting, it should now be *1000 in userspace
Jesse Barnes [Sat, 21 Apr 2007 01:00:44 +0000 (18:00 -0700)]
Oops, edid data should just be a char *, as edid.h is private to edid.c
(we can just recombine them now).
Jesse Barnes [Sat, 21 Apr 2007 00:59:30 +0000 (17:59 -0700)]
Add a monitor information structure separate from the EDID data for tracking
monitor limits, etc.
Jesse Barnes [Sat, 21 Apr 2007 00:03:50 +0000 (17:03 -0700)]
Document drm_modes.c functions.
Jesse Barnes [Fri, 20 Apr 2007 23:32:58 +0000 (16:32 -0700)]
Add a mode name generation wrapper to make name format changes easier.
Kristian Høgsberg [Fri, 20 Apr 2007 22:06:31 +0000 (18:06 -0400)]
Initialize rwlock using rwlock_init to appease lockdep validator.
Kristian Høgsberg [Fri, 20 Apr 2007 22:06:31 +0000 (18:06 -0400)]
Initialize rwlock using rwlock_init to appease lockdep validator.
Kristian Høgsberg [Fri, 20 Apr 2007 20:52:04 +0000 (16:52 -0400)]
Clean up and return if no outputs are found.
Thomas Hellstrom [Thu, 19 Apr 2007 21:25:14 +0000 (23:25 +0200)]
Avoid a fence timeout problem when a signal is pending.
Thomas Hellstrom [Fri, 20 Apr 2007 13:49:31 +0000 (15:49 +0200)]
Fix via compile error
(Reported by Benno Schulenberg.)
Dave Airlie [Wed, 18 Apr 2007 23:43:46 +0000 (09:43 +1000)]
backout SDVO control bus check and comment why this is a bad idea
Jesse Barnes [Wed, 18 Apr 2007 18:49:42 +0000 (11:49 -0700)]
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.
Thomas Hellstrom [Wed, 18 Apr 2007 14:33:28 +0000 (16:33 +0200)]
Simplify the ttm backend interface and the agp ttm backend.
Alan Hourihane [Wed, 18 Apr 2007 13:18:56 +0000 (14:18 +0100)]
Shouldn't free the mode here. It's done later on.
Alan Hourihane [Wed, 18 Apr 2007 12:52:46 +0000 (13:52 +0100)]
Fix return status
Alan Hourihane [Wed, 18 Apr 2007 11:19:16 +0000 (12:19 +0100)]
Fix build problem
Alan Hourihane [Wed, 18 Apr 2007 11:10:06 +0000 (12:10 +0100)]
free the duplicated mode.
Alan Hourihane [Wed, 18 Apr 2007 11:07:55 +0000 (12:07 +0100)]
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 ???
Alan Hourihane [Wed, 18 Apr 2007 10:55:09 +0000 (11:55 +0100)]
Merge remote branch 'origin/modesetting-101' into modesetting-101
Alan Hourihane [Wed, 18 Apr 2007 10:53:25 +0000 (11:53 +0100)]
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.
Alan Hourihane [Wed, 18 Apr 2007 10:47:21 +0000 (11:47 +0100)]
Check status after SDVO command for sdvo_set_control_bus_switch
Alan Hourihane [Wed, 18 Apr 2007 10:46:04 +0000 (11:46 +0100)]
Move SDVO PENDING check to read_response so all SDVO commands
benefit from the spin loop.
Dave Airlie [Wed, 18 Apr 2007 04:55:43 +0000 (14:55 +1000)]
make sure TMDS gets a crtc
Dave Airlie [Wed, 18 Apr 2007 04:11:49 +0000 (14:11 +1000)]
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drm_bo.c
Merge in changes from master from Thomas fixiing TTM problems
Jesse Barnes [Wed, 18 Apr 2007 01:20:05 +0000 (18:20 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Jesse Barnes [Wed, 18 Apr 2007 01:03:14 +0000 (18:03 -0700)]
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.
Dave Airlie [Wed, 18 Apr 2007 00:41:39 +0000 (10:41 +1000)]
don't crash if no desired mode
Dave Airlie [Wed, 18 Apr 2007 00:39:58 +0000 (10:39 +1000)]
backout alanh's broken commit
David Airlie [Fri, 13 Apr 2007 06:43:55 +0000 (16:43 +1000)]
clean up ring buffer and TTM in i915_driver_unload
I've commented out the framebuffer for now
Jesse Barnes [Wed, 18 Apr 2007 00:30:46 +0000 (17:30 -0700)]
Add framebuffer bo freeing to drm_mode_config_cleanup (seems like the best
place for now).
Jakob Bornecrantz [Tue, 17 Apr 2007 20:27:46 +0000 (22:27 +0200)]
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.
Jesse Barnes [Tue, 17 Apr 2007 17:14:18 +0000 (10:14 -0700)]
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
Jesse Barnes [Tue, 17 Apr 2007 17:00:37 +0000 (10:00 -0700)]
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.
Jesse Barnes [Tue, 17 Apr 2007 16:59:21 +0000 (09:59 -0700)]
Cleanup whitespace, rename macro argument.
Jesse Barnes [Tue, 17 Apr 2007 16:57:08 +0000 (09:57 -0700)]
Add prototypes for drm_bo_init_mm and drm_buffer_object_create for use by
in-kernel code.
Alan Hourihane [Tue, 17 Apr 2007 15:11:00 +0000 (16:11 +0100)]
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)
Alan Hourihane [Tue, 17 Apr 2007 15:09:40 +0000 (16:09 +0100)]
Fix SDVO outputs
Alan Hourihane [Tue, 17 Apr 2007 15:08:26 +0000 (16:08 +0100)]
Correct PCI ID for i845
Thomas Hellstrom [Tue, 17 Apr 2007 12:15:37 +0000 (14:15 +0200)]
Don't always free up memory space when we unpin buffers.
Thomas Hellstrom [Tue, 17 Apr 2007 08:53:19 +0000 (10:53 +0200)]
Fix buffer object reference problems.
(Reported by Dave Airlie).
Dave Airlie [Tue, 17 Apr 2007 08:18:42 +0000 (18:18 +1000)]
I don't think this dec is necessary and my stuff all works without ..
with it everything falls over
Dave Airlie [Tue, 17 Apr 2007 08:18:25 +0000 (18:18 +1000)]
add some missing export symbols