Jesse Barnes [Fri, 8 Aug 2008 00:15:50 +0000 (17:15 -0700)]
Make modesetting-gem build with recent kernels
Needed to merge in VM fault changes & pci_read_base API update.
Jesse Barnes [Thu, 7 Aug 2008 21:02:04 +0000 (14:02 -0700)]
Merge branch 'drm-gem' into modesetting-gem
Keith Packard [Tue, 5 Aug 2008 06:33:03 +0000 (23:33 -0700)]
Switch from shmem_getpage to read_mapping_page
Keith Packard [Tue, 5 Aug 2008 23:06:40 +0000 (16:06 -0700)]
[gem-intel] Retiring flush requests should clear flushed write_domains
When i915_gem_retire_request has a flush which matches an object write
domain, clear the write domain. This will move the object to the inactive
list rather than the flushing list, avoiding trouble with objects left stuck
on the flushing list.
Keith Packard [Tue, 5 Aug 2008 21:44:53 +0000 (14:44 -0700)]
[gem-intel] Don't clear write_domain until flush completes
In i915_gem_object_wait_rendering, if the object write domain is being
written by the GPU, the appropriate flushing commands are written to the
device and an additional request queued to mark that flush. Finally, the
function blocks on that new request.
The bug was that the write_domain in the object was cleared before the
function blocked.
If the wait is interrupted by a signal, the flushing commands may still be
pending. With the current write_domain information lost, the restarted
syscall will drop right through the write_domain test as that value was
lost, and so the function will not block at all. Oops.
Fixed by simply moving the write_domain clear until after the wait_request
succeeds. Note that the restarted system call will generate an additional
flush sequence and request, but that should be 'harmless', aside from a
slight performance impact.
Someday we'll track flushing more accurately and clear write_domains more
efficiently, but for now, this should suffice.
This bug was discovered in the 2d gem development by running x11perf
-copypixwin500 and noticing that the window got cleared accidentally.
Keith Packard [Mon, 4 Aug 2008 07:34:08 +0000 (00:34 -0700)]
Expose pin/unpin/set_tiling/flink APIs
Kristian Høgsberg [Fri, 1 Aug 2008 17:35:56 +0000 (13:35 -0400)]
Merge commit 'origin/drm-gem' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Dave Airlie [Thu, 31 Jul 2008 21:43:58 +0000 (07:43 +1000)]
Revert "i915: Move all of the irq install/uninstall to load time."
This reverts commit
965a72202b439068e62ac341990f51953457b202.
Please re-do over properly
Kristian Høgsberg [Thu, 31 Jul 2008 19:18:32 +0000 (15:18 -0400)]
Merge commit 'origin/master' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
Dave Airlie [Thu, 31 Jul 2008 03:12:36 +0000 (13:12 +1000)]
drm: add fault handler support so as to be more like possible upstream
Eric Anholt [Wed, 30 Jul 2008 21:10:36 +0000 (14:10 -0700)]
intel-gem: Replace version bump signalling GEM with I915_PARAM_HAS_GEM.
Kristian Høgsberg [Tue, 22 Jul 2008 18:24:32 +0000 (14:24 -0400)]
Make it compile again.
Eric Anholt [Wed, 30 Jul 2008 18:29:32 +0000 (11:29 -0700)]
intel-gem: Remove dead field from reverted changes.
Eric Anholt [Wed, 30 Jul 2008 18:22:48 +0000 (11:22 -0700)]
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
This reverts commit
3ad8db2071d30c198403e605f2726fc5c3e46bfd.
We ended up not needing that namespace, and I'd rather not have the churn
for producing diffs.
Dave Airlie [Wed, 30 Jul 2008 06:52:13 +0000 (16:52 +1000)]
i915: more version checks
Dave Airlie [Wed, 30 Jul 2008 06:26:51 +0000 (16:26 +1000)]
i915: add version checks for opregion on old kernels
Eric Anholt [Wed, 30 Jul 2008 03:26:38 +0000 (20:26 -0700)]
intel-gem: actually add i915_gem_debug.c.
Eric Anholt [Tue, 29 Jul 2008 18:10:47 +0000 (11:10 -0700)]
intel-gem: Check return value of pci_read_base.
Nicolai Haehnle [Tue, 29 Jul 2008 17:56:51 +0000 (19:56 +0200)]
r300: Fix cliprect emit
This makes our handling of cliprects sane. drm_clip_rect always has exclusive
bottom-right corners, but the hardware expects inclusive bottom-right corners,
so we adjust this here.
This complements Michel Daenzer's commit
57aea290e1e0a26d1e74df6cff777eb9f038f1f8
to Mesa. See also http://bugs.freedesktop.org/show_bug.cgi?id=16123 .
Eric Anholt [Tue, 29 Jul 2008 06:14:11 +0000 (23:14 -0700)]
intel: Fix typo in unused register definition name.
Eric Anholt [Mon, 28 Jul 2008 23:33:50 +0000 (16:33 -0700)]
intel-gem: checkpatch.pl on drm_proc.c new contents.
Eric Anholt [Mon, 28 Jul 2008 22:17:21 +0000 (15:17 -0700)]
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Stuart Bennett [Tue, 29 Jul 2008 01:32:13 +0000 (02:32 +0100)]
nouveau: fix nv04 fifo context save to save reg contents, not reg offset
clearly the function had never been used :)
Stuart Bennett [Tue, 29 Jul 2008 01:26:34 +0000 (02:26 +0100)]
Eric Anholt [Mon, 28 Jul 2008 18:45:22 +0000 (11:45 -0700)]
intel-gem: Another checkpatch.pl pass.
Eric Anholt [Mon, 28 Jul 2008 18:24:00 +0000 (11:24 -0700)]
intel-gem: Fix regression tests.
Main fix is an oops that was triggered by the gtt pwrite path when we don't
have the gtt initialized. Also, settle on -EBADF for "bad object handle",
and -EINVAL for "reading/writing beyond object boundary".
Eric Anholt [Sun, 27 Jul 2008 02:28:14 +0000 (19:28 -0700)]
intel-gem: Speed up tiled readpixels by tracking which pages have been flushed.
This is around 3x or so speedup, since we would read wide rows at a time, and
clflush each tile 8 times as a result. We'll want code related to this anyway
when we do fault-based per-page clflushing for sw fallbacks.
Eric Anholt [Sun, 27 Jul 2008 02:51:58 +0000 (19:51 -0700)]
intel-gem: Move debug-only functions to a separate file.
Alex Deucher [Sat, 26 Jul 2008 20:57:02 +0000 (16:57 -0400)]
NV50: s/FALSE/false/
Stefan Becker [Sat, 26 Jul 2008 14:49:14 +0000 (16:49 +0200)]
radeon: Add suspend/resume hooks for saving/clearing/restoring interrupts.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16799 .
Nicolai Haehnle [Sat, 26 Jul 2008 09:39:10 +0000 (11:39 +0200)]
r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX
DRAW_INDEX writes a vertex count to VAP_VF_CNTL. Docs say that behaviour
is undefined (i.e. lockups happen) when this write is not followed by the
right number of vertex indices.
Thus we used to do the wrong thing when drawing across many cliprects was
necessary, because we emitted a sequence
DRAW_INDEX, DRAW_INDEX, INDX_BUFFER, INDX_BUFFER
instead of
DRAW_INDEX, INDX_BUFFER, DRAW_INDEX, INDX_BUFFER
The latter is what we're doing now and which ought to be correct.
Dave Airlie [Fri, 25 Jul 2008 22:56:43 +0000 (08:56 +1000)]
tests: add some basic radeon gem tests
Dave Airlie [Fri, 25 Jul 2008 22:56:23 +0000 (08:56 +1000)]
radeon: add initial atombios modesetting and GEM -> TTM translation layer.
This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.
So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
Dave Airlie [Fri, 25 Jul 2008 22:46:38 +0000 (08:46 +1000)]
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Dave Airlie [Fri, 25 Jul 2008 03:30:08 +0000 (13:30 +1000)]
drm: don't set the signal blocker on the master process.
this lets us debug the X server through xkb startup.
Not sure what the correct answer is, probably X needs to drop
the lock when execing stuff, with input hotplug it can get
xkb stuff at any time I believe.
Dave Airlie [Fri, 25 Jul 2008 22:43:59 +0000 (08:43 +1000)]
modesetting: pass file priv to cursor
Dave Airlie [Fri, 25 Jul 2008 22:43:01 +0000 (08:43 +1000)]
nv50: remove TRUE/FALSE
Dave Airlie [Fri, 25 Jul 2008 22:41:01 +0000 (08:41 +1000)]
modesetting: pass file_priv into cursor set functions
Dave Airlie [Fri, 25 Jul 2008 22:38:59 +0000 (08:38 +1000)]
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Robert Noland [Fri, 25 Jul 2008 17:46:28 +0000 (13:46 -0400)]
[FreeBSD] Duh, we need to actually define the drm_modeset_ctl...
Dave Airlie [Fri, 25 Jul 2008 03:30:08 +0000 (13:30 +1000)]
drm: don't set the signal blocker on the master process.
this lets us debug the X server through xkb startup.
Not sure what the correct answer is, probably X needs to drop
the lock when execing stuff, with input hotplug it can get
xkb stuff at any time I believe.
Dave Airlie [Thu, 24 Jul 2008 05:22:44 +0000 (15:22 +1000)]
drm: use correct mode destructor
Robert Noland [Thu, 24 Jul 2008 04:21:00 +0000 (00:21 -0400)]
[FreeBSD] Catch up to linux on vblank-rework
Robert Noland [Wed, 23 Jul 2008 23:55:06 +0000 (19:55 -0400)]
i915: Move all of the irq install/uninstall to load time.
This resolves a panic on FreeBSD which was caused by trying
to re-initialize the swap lock. It's just much easier to
initialize all of the locks at load time. It should also
ensure that the vblank structures are available earlier.
Eric Anholt [Wed, 23 Jul 2008 18:49:25 +0000 (11:49 -0700)]
intel-gem: Fix pread math and logic errors.
Fixes an oops in fbotexture from walking off the end of the page list.
Eric Anholt [Wed, 23 Jul 2008 17:07:16 +0000 (10:07 -0700)]
intel-gem: Add a quick hack to reduce clflushing on pread.
This increases overhead for the large-readpixels case due to the repeated
page cache accessing, but greatly reduces overhead for the small-readpixels
case.
Eric Anholt [Wed, 23 Jul 2008 15:36:54 +0000 (08:36 -0700)]
intel-gem: Don't do the GTT-pwrite shortcut on tiled buffers.
These will be covered by the fence, while pread/pwrite are supposed to be
CPU-perspective writes, with manual detiling done by the client.
Eric Anholt [Mon, 21 Jul 2008 21:33:55 +0000 (14:33 -0700)]
intel-gem: Move /proc debugging to a separate file.
Dave Airlie [Tue, 22 Jul 2008 08:47:27 +0000 (18:47 +1000)]
radeon: fix typo with a better typo
Dave Airlie [Tue, 22 Jul 2008 08:10:03 +0000 (18:10 +1000)]
radeon: fix type DST vs Z cache flush
Robert Noland [Mon, 21 Jul 2008 22:04:02 +0000 (18:04 -0400)]
[FreeBSD] Improve upper_32_bits define.
Thanks to airlied.
Eric Anholt [Mon, 21 Jul 2008 21:21:16 +0000 (14:21 -0700)]
intel-gem: Remove recently added pci_read_base prototype.
This is in pci.h in the fixed patch to the kernel.
Eric Anholt [Tue, 1 Jul 2008 19:31:37 +0000 (12:31 -0700)]
intel-gem: Set up HWS when it needs a vaddr during GEM init.
This requires an updated 2D driver to not try to set it up as well.
Maarten Maathuis [Mon, 21 Jul 2008 14:57:25 +0000 (16:57 +0200)]
NV50: Don't create a "native" mode for LVDS when there is none.
Maarten Maathuis [Mon, 21 Jul 2008 14:40:55 +0000 (16:40 +0200)]
NV50: don't fail on LVDS by default
Maarten Maathuis [Mon, 21 Jul 2008 12:50:07 +0000 (14:50 +0200)]
NV50: Use bios table for load pattern when possible.
Maarten Maathuis [Mon, 21 Jul 2008 12:29:13 +0000 (14:29 +0200)]
NV50: Do detect with hpd and load detect if possible.
- Appropriate error messages when an unknown situation is encountered are included.
- Fallback to i2c will occur when needed.
Michel Dänzer [Mon, 21 Jul 2008 11:43:12 +0000 (13:43 +0200)]
Remove accidental leftover tests.
Thanks to Nicolai Haehnle for pointing this out on IRC.
Michel Dänzer [Mon, 21 Jul 2008 09:48:04 +0000 (11:48 +0200)]
Reinstate dev->vblank_enabled[].
I incorrectly thought it was obsolete.
Michel Dänzer [Mon, 21 Jul 2008 06:16:59 +0000 (08:16 +0200)]
Drop workaround for driver vblank counter going backwards.
The driver code that caused this is no longer necessary and has been dropped.
Michel Dänzer [Mon, 21 Jul 2008 06:16:59 +0000 (08:16 +0200)]
radeon: Post-vblank-rework-rework cleanups.
Thanks to the reworked vblank-rework, we can just use the hardware frame
counter directly, and make the RADEON_PARAM_VBLANK_CRTC getparam just return
what was set by the corresponding setparam.
Michel Dänzer [Mon, 21 Jul 2008 06:16:55 +0000 (08:16 +0200)]
vblank-rework rework cleanups.
Remove some dead/obsolete code and make drm_update_vblank_count() static.
Michel Dänzer [Mon, 21 Jul 2008 06:13:45 +0000 (08:13 +0200)]
Remove obsolete dev->vblank_suspend[crtc] tests.
Caused drm_update_vblank_count() not to do its thing when called from
drm_modeset_ctl() -> drm_vblank_get().
The vblank functionality no longer needs to be suspended during a modeset, so
rename the field to vblank_inmodeset.
Maarten Maathuis [Sun, 20 Jul 2008 13:40:40 +0000 (15:40 +0200)]
NV50: delay changing gpu<->non-gpu scaling modes until next modeset
Maarten Maathuis [Sun, 20 Jul 2008 12:58:46 +0000 (14:58 +0200)]
modesetting-101: Only store property value when set_property was successful.
Maarten Maathuis [Sun, 20 Jul 2008 12:55:59 +0000 (14:55 +0200)]
NV50: LVDS always needs some kind of gpu scaling
Maarten Maathuis [Sun, 20 Jul 2008 12:51:22 +0000 (14:51 +0200)]
modesetting-101: set_property should return an int, not a bool
Maarten Maathuis [Sun, 20 Jul 2008 11:49:18 +0000 (13:49 +0200)]
modesetting-101: implement optional scaling and dithering properties
Maarten Maathuis [Sat, 19 Jul 2008 22:09:06 +0000 (00:09 +0200)]
drm: As a workaround don't tear down sg with a modesetting driver.
- This allows me to maintain a useful prototype driver.
Jesse Barnes [Sat, 19 Jul 2008 17:18:02 +0000 (13:18 -0400)]
i915: convert to using drm_vblank_get/put around vblank counter usage
All interrupt off vblank count updates are done in drm_vblank_get/put
now, so convert users of the vblank counter over to that interface.
Jesse Barnes [Sat, 19 Jul 2008 17:15:23 +0000 (13:15 -0400)]
Update vblank code to new API
In my last push I forgot to convert users of drm_update_vblank_count
over to drm_vblank_get/put, since that's where any interrupt off->on
update accounting is done now. Since the modeset ioctl did something
similar (an open coded update of the counter) convert it over to using
get/put too, which saves us from having to deal with every combination
of interrupt off & on between calls.
Ian Romanick [Fri, 18 Jul 2008 19:42:43 +0000 (12:42 -0700)]
drm-gem: Fix build
On some distros missing prototypes cause kernel builds to fail. These
are hack to make the code build.
Eric Anholt [Thu, 17 Jul 2008 23:56:42 +0000 (16:56 -0700)]
intel-gem: Leave 8xx tiling on until we find any issues.
Ben Skeggs [Sun, 22 Jun 2008 15:24:11 +0000 (01:24 +1000)]
nv50: use same dma object for fb/tt access
We depend on the VM fully now for memory protection, separate DMA objects
for VRAM and GART are unneccesary. However, until the next interface break
(soon) a client can't depend on the objects being the same and must still
call NV_OBJ_SET_DMA_* methods appropriately.
Ben Skeggs [Tue, 24 Jun 2008 18:39:32 +0000 (04:39 +1000)]
nouveau: interface changes for nv5x 3d
Dave Airlie [Fri, 18 Jul 2008 04:30:57 +0000 (14:30 +1000)]
radeon: remove microcode version
Dave Airlie [Thu, 19 Jun 2008 01:38:43 +0000 (11:38 +1000)]
drm/radeon: fixup 0 vs NULL
Robert Noland [Thu, 17 Jul 2008 18:01:04 +0000 (14:01 -0400)]
[FreeBSD] drm_irq.c updates for vblank fixes.
Jesse Barnes [Thu, 17 Jul 2008 17:51:24 +0000 (13:51 -0400)]
i915: remove old broken vblank code
Remove the unused (and broken) "in vblank" code now that the core has
been fixed to use a counter while interrupts are enabled. Also make the
vblank pipe get/set ioctls into dumb stub functions, since with the new
code we can no longer let userspace control whether vblank interrupts
are enabled, or the core code will misbehave.
Jesse Barnes [Thu, 17 Jul 2008 17:48:14 +0000 (13:48 -0400)]
Avoid incorrect vblank wakeups
The current code uses the hw vblank counter exclusively, which can lead
to wakeups during the active period rather than during the vblank period
if the hw counter counts displayed frames rather than vblank periods.
This change coverts the code over to using the counter while interrupts
are enabled, fixing that issue. It also includes a couple of related
changes: one to not enable the new enable/disable behavior until the
modeset ioctl is called (to preserve old client behavior) and another to
account for lost events due to mode setting with the new counter scheme.
BSD will require similar changes to its drm_irq.c code, but they should
be straightforward.
Robert Noland [Thu, 17 Jul 2008 03:39:25 +0000 (23:39 -0400)]
FreeBSD: Fix radeon build
Owain Gordon Ainsworth [Mon, 7 Jul 2008 16:23:48 +0000 (17:23 +0100)]
BSD: change drm_locked_task*() to use the same scheme as linux.
The current code can sleep in an interrupt handler, that is bad. So
instead if we can't grab the lock, flag it and run the tasklet on
unlock.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Mon, 9 Jun 2008 12:54:53 +0000 (08:54 -0400)]
[FreeBSD] We aren't allowed to hold locks over bus_dma_tag_create or bus_dmamem_alloc.
Hong Liu [Tue, 15 Jul 2008 17:14:17 +0000 (10:14 -0700)]
This is a modified version of Hong's patch from last month, with a few
modifications to make it work correctly on my test hardware (altered the
backlight write function, made it enable the legacy backlight controller
interrupts on mobile hardware, sorted the interrupt function so we don't
get an excessive number of vblank interrupts). This lets the backlight
keys on my T61 work properly, though there's a 750msec or so delay
between the request and the brightness actually changing - this sounds
awfully like the hardware spinning waiting for a status flag to become
ready, but as far as I can tell they're all set correctly. If anyone can
figure out what's wrong here, it'd be nice to know.
Some of the functions are still stubs and just tell the hardware that
the request was successful. These can be filled in as kernel modesetting
gets integrated. I think it's worth getting this in anyway, since it's
required for backlight control to work properly on some new platforms.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Dave Airlie [Tue, 15 Jul 2008 10:27:14 +0000 (20:27 +1000)]
drm: fix missing symbol export
Dave Airlie [Tue, 15 Jul 2008 06:18:22 +0000 (16:18 +1000)]
drm: add fix for PAT on radeon with 2.6.26
Dave Airlie [Tue, 15 Jul 2008 06:18:04 +0000 (16:18 +1000)]
drm/pcigart: fix warning
Eric Anholt [Mon, 14 Jul 2008 16:16:45 +0000 (09:16 -0700)]
intel-gem: Disable tiling if we get junk from the MCHBAR read.
One of our systems has been returning 0xffffffff from all MCHBAR reads, which
means we'll need to figure out why, or add an alternate detection method.
Dave Airlie [Sat, 12 Jul 2008 06:32:09 +0000 (16:32 +1000)]
modesetting/helper: fix array overrun - count should be reset here
Eric Anholt [Fri, 11 Jul 2008 21:47:33 +0000 (14:47 -0700)]
intel-gem: Add two new ioctls for managing tiling on objects.
Various chips have exciting interactions between the CPU and the GPU's
different ways of accessing interleaved memory, so we need some kernel
assistance in determining how it works.
Only fully tested on GM965 so far.
Dave Airlie [Wed, 9 Jul 2008 04:53:47 +0000 (14:53 +1000)]
Merge remote branch 'origin/modesetting-101' into modesetting-gem
martin capitanio [Tue, 8 Jul 2008 07:58:10 +0000 (17:58 +1000)]
xgi: use true/false instead of TRUE/FALSE
Ben Skeggs [Tue, 24 Jun 2008 18:39:32 +0000 (04:39 +1000)]
nouveau: interface changes for nv5x 3d
Kristian Høgsberg [Mon, 7 Jul 2008 22:00:23 +0000 (18:00 -0400)]
Add back flink, open and close ioctls.
They fell through the cracks in
86accbcb.
Eric Anholt [Thu, 26 Jun 2008 16:35:14 +0000 (09:35 -0700)]
[intel-gem] typo fix in DRM_ERROR
Kristian Høgsberg [Mon, 7 Jul 2008 19:43:43 +0000 (15:43 -0400)]
Merge commit 'origin/drm-gem' into ms-gem
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Kristian Høgsberg [Mon, 7 Jul 2008 15:56:59 +0000 (11:56 -0400)]
Use lowercase bool constants.
Alan Hourihane [Mon, 7 Jul 2008 14:11:48 +0000 (15:11 +0100)]
Synchronize the DDC EDID read to it's fb_ddc.c counterpart
Maarten Maathuis [Sun, 6 Jul 2008 10:51:43 +0000 (12:51 +0200)]
NV50: init gamma storage
Maarten Maathuis [Sun, 6 Jul 2008 09:23:17 +0000 (11:23 +0200)]
NV50: fix minor bug in fbcon crtc selection