OSDN Git Service
Jesse Barnes [Wed, 18 Jun 2008 21:01:47 +0000 (14:01 -0700)]
Merge branch 'modesetting-101' into modesetting-gem
Jesse Barnes [Wed, 18 Jun 2008 20:57:39 +0000 (13:57 -0700)]
i915: switch back to fbcon on panic
Normally when X is running, panic messages will be invisible and the machine
will just appear to hard hang. This patch adds support for switching back to
the fbcon framebuffer on panic (through the use of a panic notifier
registration) so we can see what happened.
Note that in order to be really useful, X will have to run its VT in something
other than KD_GRAPHICS mode. Also, not all kernel errors result in panics,
some go through BUG() which may trigger another type of event, not resulting in
a switch.
Jesse Barnes [Wed, 11 Jun 2008 22:59:01 +0000 (15:59 -0700)]
Use GEM in modesetting
Use GEM for ring buffer setup and framebuffer allocation. This means reworking
the hardware status page stuff a bit (just use the basic range allocator for
vram for now) and #ifdef'ing out the TTM & DRI2 code. Works well enough to
load/unload several times and display fbcon on my T61 (though there's still
some unexplained console corruption).
Jesse Barnes [Wed, 11 Jun 2008 17:25:45 +0000 (10:25 -0700)]
Merge commit 'origin/drm-gem' into modesetting-gem
Use new GEM based ring buffer initialization. Still need to init GEM & use it
for framebuffer allocation etc.
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Eric Anholt [Wed, 11 Jun 2008 06:10:33 +0000 (23:10 -0700)]
[intel] Fix BUG_ON trigger in irq masking if you did on/off with irqs disabled.
Eric Anholt [Tue, 10 Jun 2008 22:30:23 +0000 (15:30 -0700)]
[gem] Manage the ringbuffer from the kernel in the GEM case.
This requires that the X Server use the execbuf interface for buffer
submission, as it no longer has direct access to the ring. This is
therefore a flag day for the gem interface.
This also adds enter/leavevt ioctls for use by the X Server. These would
get stubbed out in a modesetting implementation, but are required while
in an environment where the device's state is only managed by the DRM while
X has the VT.
Jesse Barnes [Wed, 11 Jun 2008 00:31:54 +0000 (17:31 -0700)]
Merge commit 'origin/drm-gem' into modesetting-gem
Passed the compile test; it's ready to ship.
Conflicts:
libdrm/Makefile.am
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_memrange.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Jesse Barnes [Mon, 9 Jun 2008 23:20:45 +0000 (16:20 -0700)]
Add EDID quirk handling
Port over EDID quirks from X.Org so we can handle more monitors. This meant
adding size info to the drm_display_mode struct, but other than that the
changes were isolated to the DRM EDID handling code (as they should be).
Eric Anholt [Sat, 7 Jun 2008 00:13:16 +0000 (17:13 -0700)]
[gem] Don't forget to munmap in the non-bo-reuse object-freeing case.
Keith Packard [Fri, 6 Jun 2008 20:54:38 +0000 (21:54 +0100)]
[intel] remove settable use_mi_batchbuffer_start
The driver can know what hardware requires MI_BATCH_BUFFER vs
MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
Keith Packard [Fri, 6 Jun 2008 20:26:03 +0000 (13:26 -0700)]
[intel] remove settable use_mi_batchbuffer_start
The driver can know what hardware requires MI_BATCH_BUFFER vs
MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
Keith Packard [Fri, 6 Jun 2008 19:59:52 +0000 (12:59 -0700)]
[intel-gem] Use timers to retire requests periodically.
Without the user IRQ running constantly, there's no wakeup when the ring
empties to go retire requests and free buffers. Use a 1 second timer to make
that happen more often.
Keith Packard [Fri, 6 Jun 2008 19:58:41 +0000 (12:58 -0700)]
[intel] free the hardware status page at driver_unload
This goes with the other hardware status page patch.
Keith Packard [Fri, 6 Jun 2008 19:57:01 +0000 (12:57 -0700)]
[intel-gem] Add explicit throttle ioctl
Instead of throttling and execbuffer time, have the application ask to
throttle explicitly. This allows the throttle to happen less often, and
without holding the DRM lock.
Keith Packard [Thu, 5 Jun 2008 23:05:35 +0000 (16:05 -0700)]
[libdrm/intel] Eliminate extra dri_gem_bo_bucket_entry structure
Place the buffer reuse links right into the dri_bo_gem object.
Keith Packard [Thu, 5 Jun 2008 22:58:55 +0000 (15:58 -0700)]
[libdrm/intel] Remove unused intel_validate_entry structure
Keith Packard [Thu, 5 Jun 2008 22:58:09 +0000 (15:58 -0700)]
[libdrm/intel] Reuse entire dri_bo_gem structure
The code was discarding the dri_bo_gem structure and saving only the kernel
handle. This lost the mmap address, causing pain when the next buffer user
wanted to map the buffer.
Keith Packard [Thu, 5 Jun 2008 21:09:57 +0000 (14:09 -0700)]
[intel] Allocate hardware status page at driver load time
I couldn't get the re-allocated HWS to work on my 965GM, so I just gave up
and made it persist across the lifetime of the driver instead.
Keith Packard [Thu, 5 Jun 2008 20:49:21 +0000 (13:49 -0700)]
Ignore X server provided mmio address
Keith Packard [Thu, 5 Jun 2008 20:47:41 +0000 (13:47 -0700)]
[intel-gem] Dump error status on wait_request failure
Dave Airlie [Fri, 6 Jun 2008 06:24:27 +0000 (16:24 +1000)]
drm: fix up fb resize again
Dave Airlie [Fri, 6 Jun 2008 05:38:53 +0000 (15:38 +1000)]
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
Dave Airlie [Fri, 6 Jun 2008 05:21:57 +0000 (15:21 +1000)]
Merge remote branch 'origin/modesetting-101' into modesetting-101-fb
Dave Airlie [Fri, 6 Jun 2008 05:21:22 +0000 (15:21 +1000)]
intelfb: add multi fb paths
Dave Airlie [Fri, 6 Jun 2008 04:55:03 +0000 (14:55 +1000)]
intelfb: remove duplicate define
Dave Airlie [Fri, 6 Jun 2008 04:53:34 +0000 (14:53 +1000)]
intelfb: admit fbdev is crap and punt on trying to resize to a larger fbdev.
Dave Airlie [Fri, 6 Jun 2008 02:02:51 +0000 (12:02 +1000)]
intelfb: move mode sets into the intel crtcs
better place to store them.
Dave Airlie [Fri, 6 Jun 2008 00:38:35 +0000 (10:38 +1000)]
drm/intel: make hotplug just be an event
Dave Airlie [Fri, 6 Jun 2008 00:31:36 +0000 (10:31 +1000)]
intel: if no spare crtc exists don't just take one.
Jesse Barnes [Thu, 5 Jun 2008 22:58:43 +0000 (15:58 -0700)]
sysfs registration/teardown fixups
A check in drm_sysfs_connector_remove was supposed to allow it to be called
even with unregistered objects, to make cleanup paths a little simpler.
However, device_is_regsitered didn't always seem to return what we thought it
would, so we'd sometimes end up leaving objects lying around rather than
unregistering them.
Fix this situation up by requiring devices to be registered before being
removed. Any problems resulting from this change should be easier to track
down than the alternative (which is leaving kobjects registered after unload).
Eric Anholt [Thu, 5 Jun 2008 15:44:46 +0000 (08:44 -0700)]
Add a function to bufmgr_fake to evict all buffers in the GTT.
This will be used by the X Server for VT switch.
Dave Airlie [Thu, 5 Jun 2008 06:32:41 +0000 (16:32 +1000)]
drm/modeset: add more debugging and fixup some fb enable/disabe bits
Dave Airlie [Thu, 5 Jun 2008 05:55:03 +0000 (15:55 +1000)]
drm/modesetting: more fb interface cleanups
Dave Airlie [Thu, 5 Jun 2008 05:21:07 +0000 (15:21 +1000)]
drm/modesetting: attempt to make fb code more sane
Dave Airlie [Thu, 5 Jun 2008 03:40:08 +0000 (13:40 +1000)]
drm: modesetting unify the hotplug init paths a lot.
remove fb callbacks, just probe into the driver to sort it out
Dave Airlie [Thu, 5 Jun 2008 01:43:48 +0000 (11:43 +1000)]
modesetting: fix fb clearing up
Dave Airlie [Thu, 5 Jun 2008 01:24:57 +0000 (11:24 +1000)]
modesetting: use surface width height for buffer allocs
Dave Airlie [Thu, 5 Jun 2008 01:20:52 +0000 (11:20 +1000)]
modesetting: add surface width/heights
Dave Airlie [Thu, 5 Jun 2008 01:11:22 +0000 (11:11 +1000)]
modesetting: initial attempt at debonging fb
Jesse Barnes [Wed, 4 Jun 2008 19:50:03 +0000 (12:50 -0700)]
i915: use kzalloc to allocate intel_output for lvds
Better to initialize all the struct fields to 0. Also more consistent with
other output init routines.
Jesse Barnes [Wed, 4 Jun 2008 16:38:44 +0000 (09:38 -0700)]
Fix crash in drm_mode_connector_update_edid_property
We need to initialize the edid_blob_ptr to NULL when we init a connector,
otherwise drm_mode_connector_update_edid_property may think there's a valid
EDID lying around and try to destroy it, causing a crash.
Dave Airlie [Wed, 4 Jun 2008 05:17:13 +0000 (15:17 +1000)]
drm: fix hotplug oops
Dave Airlie [Wed, 4 Jun 2008 05:17:00 +0000 (15:17 +1000)]
intel: report a known connector
Keith Packard [Wed, 4 Jun 2008 04:49:51 +0000 (21:49 -0700)]
Drop struct_mutex while waiting in drm_client_lock_take
struct_mutex cannot be held while blocking on DRM lock.
Dave Airlie [Wed, 4 Jun 2008 03:53:33 +0000 (13:53 +1000)]
libdrm: shouldn't rely on this
Dave Airlie [Wed, 4 Jun 2008 03:49:43 +0000 (13:49 +1000)]
drm: introduce generation counter to interface.
Idea being if you want to add new crtc/output/encoder dynamically later,
you just increase the generation counter and userspace should re-read
all the resources
Dave Airlie [Wed, 4 Jun 2008 03:16:49 +0000 (13:16 +1000)]
drm/sysfs: don't try an unregister if not registered
Dave Airlie [Wed, 4 Jun 2008 03:09:20 +0000 (13:09 +1000)]
intel: use kzalloc
Dave Airlie [Wed, 4 Jun 2008 03:09:05 +0000 (13:09 +1000)]
drm/modesetting: bo not used anymore
Dave Airlie [Wed, 4 Jun 2008 03:03:23 +0000 (13:03 +1000)]
drm: remove sysfs in driver for now.. should probably be in helper
Dave Airlie [Wed, 4 Jun 2008 03:00:31 +0000 (13:00 +1000)]
drm/modesetting: pass object handle to driver !bo
Dave Airlie [Wed, 4 Jun 2008 01:59:28 +0000 (11:59 +1000)]
drm/modesetting: overhaul the fb create/delete.
Move TTM code into the driver
Dave Airlie [Wed, 4 Jun 2008 00:34:34 +0000 (10:34 +1000)]
drm: make mode comparison more betterer.
This compares the clocks after converting to fb pico timings so we
get the same answer if the X and fb modes are the same.
Eric Anholt [Tue, 3 Jun 2008 21:34:54 +0000 (14:34 -0700)]
Fix libdrm to actually include the new code instead of just building it.
Eric Anholt [Tue, 3 Jun 2008 17:20:49 +0000 (10:20 -0700)]
Fix and hook up bufmgr code to the build.
Eric Anholt [Tue, 3 Jun 2008 16:27:37 +0000 (09:27 -0700)]
Import bufmgr code to libdrm. Not yet hooked up to the build.
Keith Packard [Mon, 2 Jun 2008 19:37:10 +0000 (12:37 -0700)]
[intel-gem] reloc_and_validate_object → object_bind_and_relocate
Just renaming this function and related parameters to match terminology used
elsewhere in the driver.
Keith Packard [Mon, 2 Jun 2008 17:59:15 +0000 (10:59 -0700)]
[intel-gem] Propagate set_domain errors.
set_domain can block waiting for rendering to complete. If that process is
interrupted by a signal, it can return -EINTR. Catch this error in all
callers and correctly deal with the result.
Alan Hourihane [Mon, 2 Jun 2008 09:44:29 +0000 (10:44 +0100)]
more checks for NULL encoder so we don't segfault.
Alan Hourihane [Mon, 2 Jun 2008 09:03:28 +0000 (10:03 +0100)]
Fix warnings
Dave Airlie [Mon, 2 Jun 2008 06:45:44 +0000 (16:45 +1000)]
drm: initial mode object groups.
This creates a default group attached to the legacy drm minor nodes.
It covers all the objects in the set. make set resources only return
objects for this set. Need to fix up other functions to only work on
objects in their allowed set.
Dave Airlie [Mon, 2 Jun 2008 06:19:21 +0000 (16:19 +1000)]
drm/modesetting: redo object handles around a core object.
handle crtc/encoders/connectors/fb/mode/property/blob using this system.
Dave Airlie [Mon, 2 Jun 2008 04:33:42 +0000 (14:33 +1000)]
drm: only report framebuffers available on this fd.
Not 100% sure this is a good idea, but I think I'd rather things
communicate with bo handles not fb ids.
Dave Airlie [Mon, 2 Jun 2008 04:04:41 +0000 (14:04 +1000)]
drm: add functions to get/set gamma ramps
Dave Airlie [Mon, 2 Jun 2008 02:58:10 +0000 (12:58 +1000)]
Merge branch 'modesetting-101-encoders' into modesetting-101
Dave Airlie [Mon, 2 Jun 2008 02:57:09 +0000 (12:57 +1000)]
drm: fixup encoder picking in set_config stage
Dave Airlie [Mon, 2 Jun 2008 01:44:35 +0000 (11:44 +1000)]
drm/modesetting: add best encoder finding for modesetting
This asks the driver to suggest the best encoder for the connector
during the pick crtcs stage.
Need to also do this during mode setting stages
Dave Airlie [Mon, 2 Jun 2008 01:12:28 +0000 (11:12 +1000)]
drm/modesetting: move some connector functions to helper.
Migrated the output mode collection into the helper.
Dave Airlie [Mon, 2 Jun 2008 00:41:12 +0000 (10:41 +1000)]
drm: fixup some interfaces so test code works again
Dave Airlie [Mon, 2 Jun 2008 00:05:54 +0000 (10:05 +1000)]
drm/modesetting: another re-org of some internals.
Move dpms into the helper functions.
Move crtc into the encoder.
Move disable unused functions into the helper.
Eric Anholt [Fri, 30 May 2008 21:42:08 +0000 (14:42 -0700)]
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Eric Anholt [Fri, 30 May 2008 20:47:34 +0000 (13:47 -0700)]
[intel-gem] Only update obj->write_domain if we're actually changing it.
The problem was revealed where on 965, the display list vertex buffer would see:
create -> (CPU, CPU)
set_domain (CPU, CPU) -> (CPU, CPU)
set_comain (CPU, 0) -> (CPU, 0) (no clflush occurred)
execbuf (GPU, 0) -> (CPU+GPU, 0) (still no clflush)
instead of:
create -> (CPU, CPU)
set_domain (CPU, CPU) -> (CPU, CPU)
set_comain (CPU, 0) -> (CPU, CPU)
execbuf (GPU, 0) -> (CPU+GPU, 0) (clflushed)
Eric Anholt [Fri, 30 May 2008 17:04:22 +0000 (10:04 -0700)]
[intel-gem] Add an option to check GTT versus CPU coherency at execbuf time.
Kristian Høgsberg [Fri, 30 May 2008 18:23:04 +0000 (14:23 -0400)]
Fix ivch i2c read function to use the "special" i2c format.
Dave Airlie [Fri, 30 May 2008 10:27:31 +0000 (20:27 +1000)]
r500: attempt to make AGP work by programming agp base in the MC correctly
Dave Airlie [Fri, 30 May 2008 05:32:58 +0000 (15:32 +1000)]
drm: switch possible crtc/clones over to encoders
Dave Airlie [Fri, 30 May 2008 05:18:07 +0000 (15:18 +1000)]
modesetting: drop crtcs/clones from the connectors
Dave Airlie [Fri, 30 May 2008 05:03:12 +0000 (15:03 +1000)]
modesetting: the great renaming.
Okay we have crtc, encoder and connectors.
No more outputs exposed beyond driver internals
I've broken intel tv connector stuff.
Really for TV we should have one TV connector, with a sub property for the
type of signal been driven over it
Dave Airlie [Fri, 30 May 2008 03:57:27 +0000 (13:57 +1000)]
drm: attach an encoder.
Time to do some renaming on the connectors I think
Dave Airlie [Fri, 30 May 2008 03:49:39 +0000 (13:49 +1000)]
drm: fix a couple of bugs in the encoder return to userspace
Dave Airlie [Fri, 30 May 2008 03:31:16 +0000 (13:31 +1000)]
drm: add encoder attach/detach
Dave Airlie [Fri, 30 May 2008 03:22:51 +0000 (13:22 +1000)]
tests: add basic encoder reading to test
Dave Airlie [Fri, 30 May 2008 02:29:45 +0000 (12:29 +1000)]
drm: add encoder free function
Dave Airlie [Fri, 30 May 2008 02:24:19 +0000 (12:24 +1000)]
drm: init the encoder list/count
Dave Airlie [Fri, 30 May 2008 02:20:36 +0000 (12:20 +1000)]
drm: add red hat copyright.
Dave Airlie [Fri, 30 May 2008 02:19:13 +0000 (12:19 +1000)]
drm: add encoder ids to the output handling
Dave Airlie [Fri, 30 May 2008 02:14:44 +0000 (12:14 +1000)]
drm: add more encoder interfaces
Dave Airlie [Fri, 30 May 2008 02:10:01 +0000 (12:10 +1000)]
libdrm: add encoder retrival
Dave Airlie [Fri, 30 May 2008 02:03:36 +0000 (12:03 +1000)]
drm: add encoder / get encoder to the modesetting resources interface
Dave Airlie [Fri, 30 May 2008 01:48:41 +0000 (11:48 +1000)]
drm: remove unused init func from outputs
Dave Airlie [Fri, 30 May 2008 01:47:57 +0000 (11:47 +1000)]
drm/modesetting: add initial encoder structures and setup functions
Dave Airlie [Fri, 30 May 2008 01:25:41 +0000 (11:25 +1000)]
modesetting: reorganise out crtc/outputs are allocated.
Use subclassing from the drivers to allocate the objects. This saves
two objects being allocated for each crtc/output and generally makes
exit paths cleaner.
Eric Anholt [Thu, 29 May 2008 19:53:13 +0000 (12:53 -0700)]
[intel-gem] Write the presumed_offset back out after updating it.
Otherwise, 965 constant state buffers get re-relocated every exec. Ouch.
Keith Packard [Tue, 27 May 2008 23:49:49 +0000 (16:49 -0700)]
[intel-gem] Clean up active/inactive/flushing list debugging.
Dave Airlie [Thu, 29 May 2008 04:02:14 +0000 (14:02 +1000)]
modesetting: reorganise code into core and helper functions.
This splits a lot of the core modesetting code out into a file of
helper functions, that are only called from themselves and/or the driver.
The driver gets called into more often or can call these functions from itself
if it is a helper using driver.
I've broken framebuffer resize doing this but I didn't like the API for that
in any case.
Dave Airlie [Thu, 29 May 2008 03:58:26 +0000 (13:58 +1000)]
modeset: disable radeon ms by default
as I'm going to break it.
Alan Hourihane [Wed, 28 May 2008 20:01:18 +0000 (21:01 +0100)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Jesse Barnes [Wed, 28 May 2008 15:24:42 +0000 (08:24 -0700)]
i915: unmap BIOS when we're done with it
At the moment, we only read it at startup time, so we can just unmap it there
when we're done.
Dave Airlie [Wed, 28 May 2008 01:12:57 +0000 (11:12 +1000)]
radeon: split microcode out into a separate header file.
Eric Anholt [Wed, 28 May 2008 00:50:39 +0000 (17:50 -0700)]
[intel-gem] Replace idlelock usage with real lock acquisition.