Ben Skeggs
13d7b06baf
drm/nv50: use a slightly different initial context for nv96
...
I'm not 100% sure that the nv94 one we were using won't work. The context
layouts are identical (well.. same ctxprog, so of course!), only a couple
of registers differ. But, be safe until we actually get some 9xxx chips
working.
2009-02-10 09:07:28 +10:00
Ben Skeggs
8a60b2d6a8
drm/nv50: correct ramfc pointer in channel header
...
Suprisingly the card still worked without this...
2009-02-10 09:02:17 +10:00
Ben Skeggs
bc0e48baa3
nv50: support chipset NV96
...
ctxprog seen in okias' trace identical to one we use on NV94, assuming
the initial context values for NV94 will work here too.
2009-02-10 09:01:00 +10:00
Ben Skeggs
31caf2f9a9
drm/nv50: let the card handle the initial context switch
...
Our PFIFO/PGRAPH context save/load functions don't really work well
(at all?) on nv5x yet. Depending on what random state the card is
in before the drm loads, fbcon probably won't work correctly.
Luckily we've setup the GPU in such a way that it'll actually do a
hw context switch for the first context. Not sure of how successful
this'd be currently on the older chips (actually, pretty sure it won't
work), so NV50 only for now.
2009-02-10 08:57:21 +10:00
Ben Skeggs
2e7db8cc34
drm/nouveau: init fbcon after we flag the card as initialised
2009-02-10 08:56:17 +10:00
Ben Skeggs
933995b1da
drm/nouveau: store vram/gart object handles for each channel
2009-02-10 08:55:30 +10:00
Ben Skeggs
417c2c411f
nv50: remove some badness, we bail in these situations now anyway
2009-02-06 05:29:14 +10:00
Ben Skeggs
95fc1b0b52
nv50/kms: be less verbose without debug=1
2009-02-04 15:03:48 +10:00
Ben Skeggs
15ed426dd4
nv50/kms: use DRM_DEBUG
2009-02-04 15:03:48 +10:00
Ben Skeggs
5923c976fb
nv50/kms: nv50_kms_ -> nv50_
2009-02-04 15:03:47 +10:00
Ben Skeggs
cd2a87a682
nv50/kms: remove the last of nv50_kms_wrapper
2009-02-04 15:03:47 +10:00
Ben Skeggs
69beb9c191
nv50/kms: remove last bit of state mirroring
2009-02-04 15:03:46 +10:00
Ben Skeggs
f16514cccc
nv50/kms: remove kms_priv
2009-02-04 15:03:46 +10:00
Ben Skeggs
ef42af67ce
nv50/kms: merge nv50_kms_crtc and nv50_crtc
2009-02-04 15:03:44 +10:00
Ben Skeggs
1b6ff5a4db
nv50/kms: merge nv50_output and nv50_kms_output
2009-02-04 15:03:44 +10:00
Ben Skeggs
4736d2172f
nv50/kms: merge nv50_connector and nv50_kms_connector
2009-02-04 15:03:43 +10:00
Ben Skeggs
8e96ee5341
nouveau: bring in current mm implementation
2009-02-04 15:03:43 +10:00
Ben Skeggs
6ef7b032ea
nouveau: bring in new mm api definitions, without the actual mm code
...
Use of the new bits is guarded with a mm_enabled=0 hardcode.
2009-02-04 13:28:39 +10:00
Ben Skeggs
34b74c06b6
nv50: ack nsource to prevent continuous protection fault irqs
2009-02-04 13:28:19 +10:00
Dave Airlie
2b0c9c01c2
radeon: add new getparam to get pcidevice
2009-01-11 09:49:00 +10:00
Dave Airlie
4b10ddff78
radeon: drop CS2 into CS, remove start/end offset
2008-12-19 16:31:55 +10:00
Jesse Barnes
d5d5aca7f9
Merge branch 'master' into modesetting-gem
2008-12-03 11:53:36 -08:00
Ben Skeggs
7e4e0fbbb8
nv50: support NV94 chipset
2008-11-23 18:49:09 +11:00
Ben Skeggs
52232ad702
nv50: update context-related tables for original 8800GTS
...
I either messed up when I pulled these from a mmio-trace last time, or
the previous values didn't work on my card. Hopefully it's the former!
In any case, at least one of the original NV50 chipsets work now.
2008-11-21 13:18:58 +11:00
Jesse Barnes
2e2fd6c632
DRM: make drm_map_type match upstream kernel
...
Since the TTM type isn't upstream yet, we need to make sure libdrm uses
what the kernel uses, which is _DRM_GEM = 6.
2008-11-20 11:00:29 -08:00
Jesse Barnes
5923831baf
DRM: make drm_map_type match kernel
...
GEM is upstream, but TTM isn't, so _DRM_GEM needs to be 6, not 7.
2008-11-20 10:57:33 -08:00
Stephane Marchesin
c029ed2510
Unbreak drm build.
2008-11-19 23:17:27 +01:00
Jesse Barnes
c67a83dfe1
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-11-19 12:42:49 -08:00
Jerome Glisse
7270731a8b
radeon: protect cs ioctl atomic part with a mutex
...
A small subset of CS need to be atomic (relocation+IB commit to
ring) right now, because of the way relocation are handled, we
need to protect the whole ioctl.
2008-11-16 18:11:00 +01:00
Jesse Barnes
965b4d662a
Merge branch 'master' into modesetting-gem
...
Conflicts:
libdrm/Makefile.am
libdrm/intel/intel_bufmgr.h
libdrm/intel/intel_bufmgr_fake.c
libdrm/intel/intel_bufmgr_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
2008-11-13 15:30:06 -08:00
Jesse Barnes
276c07d885
libdrm: add support for i915 GTT mapping ioctl
...
Add a drm_intel_gem_bo_map_gtt() function for mapping a buffer object
through the aperture rather than directly to its CPU cacheable memory.
2008-11-13 13:52:04 -08:00
Jakob Bornecrantz
9a4cb7eab4
mode: Minor reodering and renaming
2008-11-12 19:17:18 +01:00
Jakob Bornecrantz
17789a409d
mode: Reorder the ioctls and numbering
...
This is to fill in the gaps left by the removal of
the hotplug ioctls. And they also look better :)
2008-11-12 19:10:50 +01:00
Jakob Bornecrantz
1ead45c8f0
mode: Remove hotplug support from ioctl interface
2008-11-12 18:40:04 +01:00
Jakob Bornecrantz
13948c635d
mode: Unify types for ids and strings
2008-11-12 18:16:38 +01:00
Dave Airlie
15464f5181
radeon: add gart useable size to report to userspace
2008-11-10 15:38:32 +10:00
Dave Airlie
994f240503
radeon: fix ring tail overflow issue since alignment
2008-11-10 15:25:27 +10:00
Dave Airlie
758376e6eb
radeon: disable HDP read cache for now
2008-11-10 15:25:12 +10:00
Dave Airlie
08ef5b5e67
radeon: force all ring writes to 16-dword alignment.
2008-11-10 15:24:42 +10:00
Jerome Glisse
7abb8416a7
radeon: add more packet3 relocations handling
2008-11-09 18:48:46 +01:00
Dave Airlie
68fcb7770e
radeon: make build again
2008-11-03 09:58:12 +10:00
Dave Airlie
0e1df6216e
radeon: add mtrr support for VRAM aperture.
2008-11-03 09:52:25 +10:00
Dave Airlie
2b9a7d5381
radeon: disable AGP for certain chips if not specified until we figure it out
2008-11-03 09:51:57 +10:00
Dave Airlie
d3aa052f61
radeon: disable debugging message
2008-11-03 09:51:33 +10:00
Dave Airlie
28c9eb7b74
radeon: commit ring after emitting the buffer discards
2008-11-03 09:50:46 +10:00
Dave Airlie
e829d5b6bc
radeon: setup isync cntl properly
2008-11-03 09:47:49 +10:00
Dave Airlie
31b8a640db
radeon: overhaul ring interactions
...
emit in 16-dword blocks, emit irqs at same time as everything else
2008-11-03 09:46:54 +10:00
Dave Airlie
4ef8ace9a9
radeon: add proc debugging for interrupts/ring
2008-11-03 09:45:43 +10:00
Dave Airlie
be3dac976e
radeon: only enable dynclks if asked for
2008-11-03 09:44:32 +10:00
Dave Airlie
31f8d4218c
radeon: add wait rendering API
2008-11-03 09:44:03 +10:00
