ba840fca19
linux: on_each_cpu has 3 args on 2.6.27
2008-08-17 00:35:06 +02:00
a2adc69656
i915: finish removing TTM bits
...
Makes it build again.
2008-08-16 12:09:24 -07:00
d313108167
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-08-16 11:45:53 -07:00
893315d49e
i915: set domain properly on fb mapping, flush out changes
...
The user visible ioctl does this, but since we call into GEM internals
directly, we have to flush things ourselves. Fixes initial fb console
corruption.
2008-08-16 11:35:10 -07:00
2030db7532
radeon: reserve 64k of VRAM for now for text mode so we don't trample it
...
need to revisit this later I'm sure
2008-08-15 09:56:42 +10:00
e0bbd04eb0
radeon: fix LVDS modes problem
2008-08-15 09:42:06 +10:00
30ff279e42
radeon: add support for memory map init
2008-08-14 14:43:51 +10:00
5f9e4a764a
i915: update cursor handling to use GEM objects
2008-08-13 16:57:42 -07:00
2d4420c666
Merge branch 'radeon-gem-cs' into modesetting-gem
...
Conflicts:
libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/drm_vm.c
shared-core/i915_dma.c
shared-core/r300_cmdbuf.c
shared-core/radeon_drv.h
2008-08-14 09:36:34 +10:00
2a65759d15
Add com bios asic init bits
2008-08-14 09:19:03 +10:00
f38fff5416
Fill in and make use of more com bios tables on legacy chips
2008-08-14 09:19:03 +10:00
9b79d356c1
Add additional quirks from ddx
2008-08-14 09:19:03 +10:00
a1f1202470
Fix warnings
2008-08-14 09:19:03 +10:00
b486ed7f7d
Get legacy working finally
...
- extra ~ in RADEON_WRITE_P()
- re-arrange crtc setup a bit
- add debugging for tracing calls
- fix pitch calculation
2008-08-14 09:19:03 +10:00
8867eca872
set base in legacy crtc mode set
2008-08-14 09:19:03 +10:00
ae89ced7de
Convert COM BIOS to table offset lookup function
2008-08-14 09:19:03 +10:00
5af426a2b2
Restructure cursor handling and add support for legacy cursors
2008-08-14 09:19:03 +10:00
f2351ab38c
atom: implement crtc lock
2008-08-14 09:19:03 +10:00
e20c670a5a
LUT updates
...
- Add gamma set for legacy chips
- Add 16 bpp gamma set
2008-08-14 09:19:03 +10:00
d4f9eaa55a
various cleanups
...
- white space
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
2008-08-14 09:19:03 +10:00
019745c417
Add legacy dac detect stubs
2008-08-14 09:19:03 +10:00
b6f5b8ec71
unify connector, i2c handling for atom and legacy
2008-08-14 09:19:02 +10:00
5f427e9aae
Brute force port of legacy crtc/encoder code
...
- removed save/init/restore chain with set functions
2008-08-14 09:19:02 +10:00
7677c2dba5
on_each_cpu() compat fixup from krh
2008-08-14 09:19:02 +10:00
0580785030
radeon: FEDORA: patch to make 3D driver work
...
set gart buffers start
2008-08-14 09:15:28 +10:00
58df2fa0ec
radeon: remove debugging
2008-08-14 09:14:56 +10:00
b0ee12e6bb
radeon: use mm_enabled variable to denote memory manager running
2008-08-14 09:14:14 +10:00
18020e5e96
radeon: make buffer swap for older drivers work again on GEM
2008-08-14 09:12:36 +10:00
957c71ff52
radeon: FEDORA: add old DMA buffers on top of GEM
...
This really shouldn't go upstream, it just lets me
run the old 3D driver on GEM setup system
2008-08-14 09:10:11 +10:00
b8724ae647
Merge branch 'modesetting-101' into modesetting-gem
2008-08-13 10:09:41 -07:00
2f03ba4aad
Merge branch 'master' into modesetting-gem
...
Conflicts:
libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
2008-08-13 10:08:02 -07:00
af12ef4f6b
Don't call the vblank tasklet with irqs disabled.
...
If a specific tasklet shares data with irq context,
it needs to take a private irq-blocking spinlock within
the tasklet itself.
2008-08-13 10:04:21 +02:00
085df6491e
Add error checking to framebuffer creation
...
Make the Intel routine return an error if needed and make the core check for
it.
2008-08-12 18:23:58 -07:00
08faab27e5
drm_vm: fix for build on 2.6.22
...
thanks to malc0 for pointing it out
2008-08-11 10:58:41 +10:00
280d415957
drm: add OS_HAS_GEM option.
...
To build i915 driver pass OS_HAS_GEM=1 to make for now
2008-08-11 10:47:00 +10:00
f79ed55462
NV50: enable hotplug irq
2008-08-09 19:47:06 +02:00
2b7feebb8a
NV50: call drm_sysfs_hotplug_event when appropriate
2008-08-09 19:33:32 +02:00
12e6a114cf
drm: TRUE/true
2008-08-09 17:19:16 +10:00
e1b8e79796
Merge branch 'drm-gem'
...
Conflicts:
shared-core/i915_dma.c
This brings in kernel support and userland interface for intel GEM.
2008-08-08 14:05:01 -07:00
c2184e450e
radeon: add initial support for legacy crtc/encoders.
...
not all there yet
2008-08-08 16:04:45 +10:00
8074b2e83d
Make modesetting-gem build with recent kernels
...
Needed to merge in VM fault changes & pci_read_base API update.
2008-08-07 17:15:50 -07:00
c7fb19e9b0
Merge branch 'drm-gem' into modesetting-gem
2008-08-07 14:02:04 -07:00
ac20e14d23
Switch from shmem_getpage to read_mapping_page
2008-08-06 10:11:11 -07:00
8c042a0b05
radeon: fixup PCI GART table with GEM enabled
2008-08-06 15:59:31 +10:00
6435958673
radeon: just evict to TT not cached
2008-08-06 15:58:09 +10:00
a6c075fca6
drm: don't teardown things in modeset paths
2008-08-06 15:57:38 +10:00
04b5584c62
pcigart: fixup memset + remove wbinvd
2008-08-06 15:56:08 +10:00
dc0546c87f
[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.
2008-08-05 16:06:40 -07:00
ceb3d5e383
[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.
2008-08-05 14:44:53 -07:00
4748fbcbd7
radeon: fix blit due to registers wrong
2008-08-05 11:36:37 +10:00
fd75c02ddd
drm: finish bo after lastclose
2008-08-04 14:59:49 +10:00
29649ddede
radeon: don't use ring if cp not going
2008-08-04 14:56:08 +10:00
717dd804d0
drm: fixup master code to use krefs
2008-08-04 14:54:32 +10:00
129c8a1181
modesetting: pick_crtcs can't be static
2008-08-04 14:53:14 +10:00
922f74f3c9
drm: remove unneeded debugging
2008-08-04 14:52:58 +10:00
086716c8e2
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
2008-08-01 13:35:56 -04:00
5052e966ec
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
2008-07-31 15:18:32 -04:00
296073dc5f
drm: remove object hash
2008-07-31 14:39:25 +10:00
d2d7f3069d
drm: userspace rip out TTM API
2008-07-31 13:31:30 +10:00
10d5b037b8
drm: add fault handler support so as to be more like possible upstream
2008-07-31 13:12:36 +10:00
55761b2fe7
drm: add fault handler support so as to be more like possible upstream
...
(cherry picked from commit 10d5b037b8
2008-07-31 13:11:28 +10:00
9b8d71b5eb
TTM: remove API and userspace objects.
...
This removes all the TTM userspace API and all userspace objects.
It also removes the drm_bo_lock.c code
2008-07-31 12:54:48 +10:00
6d4e147480
Make it compile again.
2008-07-30 16:34:37 -04:00
689548b527
intel-gem: Remove dead field from reverted changes.
2008-07-30 11:29:32 -07:00
33c8e03787
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
...
This reverts commit 3ad8db2071
2008-07-30 11:25:34 -07:00
fb5542aaa8
radeon: hack gem to get an offset back for Mesa.
2008-07-30 17:06:11 +10:00
95c02743c9
i915: more version checks
2008-07-30 16:52:13 +10:00
02b09d271c
i915: add version checks for opregion on old kernels
2008-07-30 16:26:59 +10:00
8fc72aef70
intel-gem: actually add i915_gem_debug.c.
2008-07-29 20:26:38 -07:00
0f78e30e0a
intel-gem: Check return value of pci_read_base.
2008-07-29 11:10:47 -07:00
0452be8826
radeon: move code around putting emit into cs
2008-07-29 18:05:11 +10:00
4234f82acc
radeon_cs: add relocate hook for mm and non-mm relocations
2008-07-29 16:51:47 +10:00
e68b57c17d
intel-gem: checkpatch.pl on drm_proc.c new contents.
2008-07-28 23:12:41 -07:00
1d2bb68d28
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
2008-07-28 23:12:26 -07:00
487c42bd42
intel-gem: Another checkpatch.pl pass.
2008-07-28 11:45:22 -07:00
1bdf35fe19
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".
2008-07-28 11:29:16 -07:00
f85fd1b42d
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.
2008-07-28 11:25:19 -07:00
dc3a7c023d
r300: initial command stream parser for packet 0.
...
this at least parses the DDX stream and lets me run gnome-terminal/metacity
2008-07-28 17:27:24 +10:00
38835f9cd2
radeon command submission start
...
take code from Jerome munge into a TTM IB re-use
2008-07-28 15:21:13 +10:00
04ae66db1c
intel-gem: Move debug-only functions to a separate file.
2008-07-26 19:52:47 -07:00
5282a505b6
NV50: s/FALSE/false/
2008-07-26 16:57:02 -04:00
514c05cebe
radeon: Add suspend/resume hooks for saving/clearing/restoring interrupts.
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16799 .
2008-07-26 16:49:14 +02:00
df9871064e
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.
2008-07-26 08:56:23 +10:00
31da9492a4
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-26 08:46:38 +10:00
7fd7ba87f3
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.
2008-07-26 08:46:09 +10:00
66723c09f5
modesetting: pass file priv to cursor
2008-07-26 08:43:59 +10:00
2be292f6ea
nv50: remove TRUE/FALSE
2008-07-26 08:43:01 +10:00
11d3075087
modesetting: pass file_priv into cursor set functions
2008-07-26 08:41:01 +10:00
fb05c4d621
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-26 08:38:59 +10:00
50db5aefa1
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.
2008-07-25 13:30:08 +10:00
5342845375
drm: use correct mode destructor
2008-07-24 15:22:44 +10:00
6d258ddf77
intel-gem: Fix pread math and logic errors.
...
Fixes an oops in fbotexture from walking off the end of the page list.
2008-07-23 11:49:25 -07:00
439d710683
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.
2008-07-23 10:10:54 -07:00
bddb952578
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.
2008-07-23 10:10:48 -07:00
a5d8f35f0f
intel-gem: Move /proc debugging to a separate file.
2008-07-23 10:10:44 -07:00
e31d27857f
intel-gem: Remove recently added pci_read_base prototype.
...
This is in pci.h in the fixed patch to the kernel.
2008-07-21 14:21:16 -07:00
67d1521566
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.
2008-07-21 14:19:53 -07:00
4d5b9f4848
NV50: Don't create a "native" mode for LVDS when there is none.
2008-07-21 16:57:25 +02:00
147ef45873
NV50: don't fail on LVDS by default
2008-07-21 16:40:55 +02:00
03f8208ab0
NV50: Use bios table for load pattern when possible.
2008-07-21 14:50:07 +02:00
d00644c27d
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.
2008-07-21 14:29:13 +02:00
4be367b84b
Reinstate dev->vblank_enabled[].
...
I incorrectly thought it was obsolete.
2008-07-21 11:48:04 +02:00
f529a510d2
Drop workaround for driver vblank counter going backwards.
...
The driver code that caused this is no longer necessary and has been dropped.
2008-07-21 08:16:59 +02:00
205aff6a5c
vblank-rework rework cleanups.
...
Remove some dead/obsolete code and make drm_update_vblank_count() static.
2008-07-21 08:16:55 +02:00
014935b680
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.
2008-07-21 08:13:45 +02:00
685bca02fe
NV50: delay changing gpu<->non-gpu scaling modes until next modeset
2008-07-20 15:40:40 +02:00
e51cd78cac
modesetting-101: Only store property value when set_property was successful.
2008-07-20 14:58:46 +02:00
f1e4785d4c
NV50: LVDS always needs some kind of gpu scaling
2008-07-20 14:55:59 +02:00
3ef1d05001
modesetting-101: set_property should return an int, not a bool
2008-07-20 14:51:22 +02:00
65803e53a6
modesetting-101: implement optional scaling and dithering properties
2008-07-20 13:49:18 +02:00
e2ffee839e
drm: As a workaround don't tear down sg with a modesetting driver.
...
- This allows me to maintain a useful prototype driver.
2008-07-20 00:09:06 +02:00
6ac1f8a760
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.
2008-07-19 13:21:38 -04:00
4d83a751b4
drm-gem: Fix build
...
On some distros missing prototypes cause kernel builds to fail. These
are hack to make the code build.
2008-07-18 12:42:43 -07:00
f5c2f00e2f
intel-gem: Leave 8xx tiling on until we find any issues.
2008-07-18 12:10:41 -07:00
2204f926ab
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.
2008-07-17 13:55:24 -04:00
dfd441cf96
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>
2008-07-15 10:14:17 -07:00
764573f3b8
drm: fix missing symbol export
2008-07-15 20:27:14 +10:00
abdd523c75
drm: add fix for PAT on radeon with 2.6.26
2008-07-15 16:18:22 +10:00
76c8e19a29
drm/pcigart: fix warning
2008-07-15 16:18:04 +10:00
78f1fc9cbc
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.
2008-07-14 09:16:45 -07:00
a9089c4557
modesetting/helper: fix array overrun - count should be reset here
2008-07-12 16:32:09 +10:00
a0474be4e7
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.
2008-07-11 18:58:02 -07:00
2556341f8b
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-09 14:53:47 +10:00
eac0933be7
xgi: use true/false instead of TRUE/FALSE
2008-07-08 17:58:10 +10:00
38a5f6686c
Add back flink, open and close ioctls.
...
They fell through the cracks in 86accbcb
2008-07-07 18:00:23 -04:00
1f9a5307ac
[intel-gem] typo fix in DRM_ERROR
2008-07-07 12:49:01 -07:00
3e02f7fd31
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
2008-07-07 15:43:43 -04:00
7fd8a5de63
Use lowercase bool constants.
2008-07-07 12:04:35 -04:00
0b7d9a97bd
Synchronize the DDC EDID read to it's fb_ddc.c counterpart
2008-07-07 15:11:48 +01:00
d5d3f31b10
NV50: init gamma storage
2008-07-06 12:51:43 +02:00
88f668a0b9
NV50: fix minor bug in fbcon crtc selection
2008-07-06 11:23:17 +02:00
6738e7b00b
modesetting-101: Rename DPMS modes to avoid compatibility issues with xorg definitions.
2008-07-06 11:08:49 +02:00
e810cb9243
modesetting-101: rename modeflags, as to avoid conflicts with the xorg definitions
2008-07-06 10:52:25 +02:00
d495a6e28f
NV50: minor fix
2008-07-06 10:11:33 +02:00
e1cd21bcc8
NV50: remove edid when monitor is gone, improve fbcon, misc fixes
...
- This should avoid switching crtc's when going to fbcon.
2008-07-05 20:17:49 +02:00
c48cddc7ef
NV50: fix switch_fb and connector_is_digital
2008-07-05 16:54:26 +02:00
7cbc5f6145
modesetting-101: Make the interface variable names a little more consistent + modeprint changes.
...
- All things are now called _id when they are id's.
- modeprint now accepts driver name as first argument.
2008-07-05 12:04:07 +02:00
be31a0fa73
modesetting-101: tv_left_margin_property shouldn't be immutable.
2008-07-04 18:47:59 +02:00
0028ca33e9
Forgot the 0'th element for the tv property.
2008-07-04 17:37:45 +02:00
c9915d695d
modesetting-101: Move some defines used for enumeration into the public header.
...
- Otherwise userspace has no idea of the meaning.
2008-07-04 17:28:04 +02:00
b29578103f
[modesetting-101] Add subconnector and select_subconnector properties.
...
- These facilitate DVI-I and tv-out that can drive multiple types of signals.
2008-07-04 17:19:11 +02:00
142a309604
modesetting: rip out all of the generation code.
...
not needed, hotplug will work just as well hopefully.
2008-07-04 09:34:24 +10:00
062d850620
nv50: s/FALSE/false && s/TRUE/true
2008-07-03 09:08:01 +02:00
d5ca5c9cd3
[drm-sysfs] connected is ambigious in the context of a connector, replace with enabled
2008-07-03 08:07:35 +02:00
47c8f31741
NV50: replace active by enabled
2008-07-03 07:18:18 +02:00
02b30739f7
[modeseting-101] add connected field to sysfs
2008-07-03 01:05:07 +02:00
59a9a756e2
modesetting: lookup blob using correct identifier.
...
blob is a blob not a connector
2008-07-03 08:06:44 +10:00
70ba087191
drm: fix encoders get permissions
2008-07-03 08:00:39 +10:00
f1fe9178f1
NV50: basic fbcon + misc fixes
...
- There is one fb, used for as many outputs as possible.
- Eventually smaller screens will be scaled to see the full console, but for the moment this'll do.
2008-07-02 16:14:48 +02:00
94dcc83ad2
Revert "i915: only use tiled blits on 965+"
...
This reverts commit 727d4f1d16
2008-07-01 16:09:02 -07:00
727d4f1d16
i915: only use tiled blits on 965+
...
When scheduled swaps occur, we need to blit between front & back buffers. If
the buffers are tiled, we need to set the appropriate XY_SRC_COPY tile bit, but
only on 965 chips, since it will cause corruption on pre-965 (e.g. 945).
Bug reported by and fix tested by Tomas Janousek <tomi@nomi.cz>.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2008-07-01 12:25:16 -07:00
e935925cd7
i915: enable bus mastering on i915 at resume time
...
On 9xx chips, bus mastering needs to be enabled at resume time for much of the
chip to function. With this patch, vblank interrupts will work as expected
on resume, along with other chip functions. Fixes kernel bugzilla #10844 .
Signed-off-by: Jie Luo <clotho67@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2008-07-01 12:22:54 -07:00
2b9c5719c0
NV50: switch to fixed point scale factor calculations
2008-07-01 16:00:09 +02:00
bc32d1798a
NV50: some i2c cleanup
2008-07-01 15:14:30 +02:00
91c742663a
NV50: use list_head item instead of list_head head to avoid confusion
2008-06-27 18:58:13 +02:00
9f28da80f6
Change some obviously wrong things about property blobs, still broken though.
...
- I do not fully understand these blobs, so i'm leaving it at this for the moment.
2008-06-27 18:45:08 +02:00
71906e86e8
[modesetting-101] Actually store properties when being changed.
2008-06-27 16:30:25 +02:00
01ee5eda9a
NV50: A minor change.
2008-06-27 01:29:30 +02:00
701011224c
NV50: Implement DPMS.
2008-06-27 01:16:36 +02:00
d88616555d
[modesetting-101] tab-cleanup
2008-06-26 23:21:01 +02:00
087e3f577d
Revert "modesetting-101: Make dpms property optional + misc cleanup."
...
This reverts commit 13943fe582
2008-06-26 23:12:04 +02:00
13943fe582
modesetting-101: Make dpms property optional + misc cleanup.
...
- intel_crt seems the only one to provide it, so init it there.
2008-06-26 21:28:29 +02:00
4d85d5d251
NV50: i misunderstood NOUVEAU_MEM_INTERNAL, so remove it
2008-06-25 15:27:07 +02:00
09b67dda0b
NV50: Some cleanup and fixes.
2008-06-25 15:16:38 +02:00
d55629a13d
silence warning
2008-06-24 23:18:29 +01:00
d726eb2e5e
i915: remove unused variable
...
Leftover dev_priv from the move of the suspend/resume code into shared-core.
2008-06-24 12:57:21 -07:00
893cd01a1d
i915: register definition & header file cleanup
...
It would be nice if one day the DRM driver was the canonical source for
register definitions and core macros. To that end, this patch cleans things up
quite a bit, removing redundant definitions (some with different names
referring to the same register) and generally tidying up the header file.
2008-06-24 12:51:29 -07:00
5dbcb7551f
NV50: minor change
2008-06-24 20:29:08 +02:00
2c6feb7a5a
[intel-gem] Include drm_compat.h to get kmap_atomic_prot_pfn
2008-06-24 09:52:43 -07:00
c0043155ad
drm_compat: it's CONFIG_HIGHMEM, not CONFIG_HIMEM
...
A mis-spelled config option (was it spelled that way in the past?)
eliminated kmap_atomic_prot_pfn from core DRM.
2008-06-24 09:52:33 -07:00
ed73651d47
[intel-gem] Recover resources from wedged hardware.
...
Clean up queues, free objects. On the next entervt, unmark the hardware to
let the user try again (presumably after resetting the chip). Someday we'll
automatically recover...
2008-06-24 09:52:14 -07:00
71d975072c
[intel-gem] pwrite through GTT
...
Pin/copy_from_user/unpin through the GTT to eliminate clflush costs.
Benchmarks say this helps quite a bit.
2008-06-24 09:52:05 -07:00
14522b3e1b
NV50: fix a few misc things
2008-06-24 12:38:57 +02:00
315fef7ee4
NV50: fix cursor hide/show
2008-06-24 10:16:52 +02:00
e7582cfff6
NV50: These are actually errors.
2008-06-24 09:41:13 +02:00
5072a2911e
NV50: fix some misc bugs
2008-06-24 00:00:02 +02:00
246b41fea4
[modesetting-101] update mode count after fill_modes.
...
- This avoids returning with a mode count of 0, thus not allocating space for the 2nd ioctl.
2008-06-23 22:59:17 +02:00
0a45f15066
NV50: Improve set_config and fix some minor bugs.
2008-06-23 20:33:32 +02:00
b0b0f37443
NV50: Fix a few more possible leaks.
2008-06-22 19:04:22 +02:00
7c9551a464
fix typo
2008-06-22 18:58:04 +02:00
e67cd7dda9
NV50: A few minor added safeties + cleanup.
2008-06-22 18:47:51 +02:00
3809209349
Undo something i didn't want to change.
...
- I made it consistent with recent kernel fb code (maybe this is older bugged code?)
- Still i don't use this and i should leave it to others.
2008-06-22 17:01:30 +02:00
473a1997ac
NV50: Initial import of kernel modesetting.
2008-06-22 16:29:00 +02:00
11f2a2ed6f
agp: use true/false instead of TRUE/FALSE
2008-06-22 18:25:22 +10:00
8be6ec491f
[intel-gem] Add /proc/dri/*/i915_gem_interrupt
...
This tracks most of the interrupt-related status, including the
interrupt registers in the chip and the sequence number variables.
2008-06-21 00:13:18 -07:00
f4bd566e0b
[intel-gem] Remove unused variable.
2008-06-21 00:10:10 -07:00
54817317e9
[intel-gem] Use polling in i915_gem_idle instead of interrupts.
...
While waiting for the hardware to idle on leavevt or lastclose, poll
for the sync sequence number instead of waiting for an interrupt. This
allows the code to bail if the hardware hangs for some reason. Also, this
avoids issues with signals as the exisiting wait function is interruptible.
2008-06-20 21:10:42 -07:00
71b1623e22
[intel-gem] Add intel-specific /proc entries to help monitor gem operation
...
This adds gem_active, gem_flushing, gem_inactive, gem_request and gem_seqno
entries to monitor gem operation and help debug issues.
2008-06-20 21:07:46 -07:00
2bd9799e4c
Add device-specific proc_init and proc_cleanup hooks
...
This allows device drivers to add proc files
2008-06-20 16:40:14 -07:00
918420deef
[intel-gem] Use shmem_getpage instead of find_or_create_page
...
find_or_create_page doesn't quite set up pages correctly; any newly created
pages aren't hooked into the shmem object quite right; user space mmaps of
those pages end up mapping pages full of zeros which then get written to the
real pages inappropriately. This patch requires that the kernel export
shmem_getpage.
2008-06-20 00:21:57 -07:00
52e5d24fae
[intel-gem] Add DRM_IOCTL_I915_GEM_SW_FINISH to flag CPU writes
...
When a software fallback has completed, usermode must notify the kernel so
that any scanout buffers can be synchronized. This ioctl should be called
whenever a fallback completes to flush CPU and chipset caches.
2008-06-20 00:21:57 -07:00
1915de2c56
drm: only use kernel ioctl cmd when doing a core ioctl.
...
Need to overhaul the mess that is driver ioctls
2008-06-20 15:35:47 +10:00
8712f0a17b
drm: fix the ioctl to not believe userspace.
...
believing userspace causes oopses
2008-06-20 12:03:41 +10:00
f58e21c7d0
i915: add blanking support to intelfb
...
Got tired of not having my LCD actually turn off when I left the machine at the
console.
2008-06-18 16:49:51 -07:00
57b8837b4e
i915: cleanup PCI state before disabling MSI
...
Core MSI code will BUG() if an interrupt handler is still registered when
pci_disable_msi() is called.
2008-06-18 15:31:48 -07:00
86accbcb34
Merge commit 'origin/drm-gem' into modesetting-gem
...
Lots of conflicts, seems to load ok, but I'm sure some bugs snuck in.
Conflicts:
linux-core/drmP.h
linux-core/drm_lock.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-06-18 15:25:54 -07:00
c843d47b90
i915: use WC mapping for framebuffer screen_base
2008-06-18 14:51:46 -07:00
241ff808b0
Merge branch 'modesetting-101' into modesetting-gem
2008-06-18 14:01:47 -07:00
7010d50007
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.
2008-06-18 13:57:39 -07:00
e7424e4580
[intel] Quirk away MSI support on 945G/GM.
...
The PCI caps register reports MSI support even though it isn't really there.
2008-06-16 15:15:02 -07:00
Maarten Maathuis
Jesse Barnes
Dave Airlie
Alex Deucher
Thomas Hellstrom
Dave Airlie
Eric Anholt
Keith Packard
Kristian Høgsberg
Stefan Becker
Michel Dänzer
Jesse Barnes
Ian Romanick
Hong Liu
martin capitanio
Alan Hourihane
Jesse Barnes
Jie Luo
root
Jesse Barnes