84e2ad8b7b
drm/nvd9/disp: bail out of mode_set_base if no fb bound to crtc
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:12:11 +10:00
c20ab3e1cb
drm/nvd9/disp: stub some more api hooks so we don't oops on resume
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:12:08 +10:00
ff920bfbe6
drm/nouveau: fix printk typo in ioremap failure path
...
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:12:05 +10:00
8ce51fcfee
drm/nvc0/pm: minor clock readback fixes
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:55 +10:00
59ef9742f6
drm/nv40/pm: execute memory reset script from vbios
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:51 +10:00
6d6538a0c3
drm/nv50/gr: refactor initialisation
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:45 +10:00
8c06e60ed4
drm/nouveau: if requested, try harder at disabling sysmem pushbufs
...
On >=nv50, userspace would still end up allocating pushbufs in GART.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:41 +10:00
fbba036a56
drm/nv50/gr: enable ctxprog xfer only when we need it to save power
...
This patch adds instructions to ctxprog and by doing, impacts context
switching performance. My testcase showed a 1% performance cost using
glxgears that is a context-switch bound application.
Please test and report bugs/performance/power/other.
Many thanks to Maxim Levitsky for his dedicated work on lowering power
consumption with nouveau.
More patches are coming thanks to his work:
https://bugs.freedesktop.org/show_bug.cgi?id=37922
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:28 +10:00
c16a3a358b
drm/nouveau/dp: add support for displayport table 0x30
...
Written from observations of my NVD9's vbios, completely untested due to
my NVD9 lacking actual DisplayPort connectors..
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:21 +10:00
5f1800bd8a
drm/nouveau/dp: return master dp table pointer too when looking up encoder
...
Will need to be able to distinguish 2.0/2.1 from 3.0 soon. Also, move
the vbios parsing to nouveau_dp where it belongs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:18 +10:00
721b0821ad
drm/nouveau/bios: simplify U/d table hash matching func to just match
...
The caller is now responsible for parsing its own lists (or whatever) of
possible encoders.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:14 +10:00
5b3eb95fd8
drm/nouveau/dp: preserve non-pattern bits in DP_TRAINING_PATTERN_SET
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:09 +10:00
2834f86864
drm/nvc0/gr: remove MODULE_FIRMWARE() lines
...
We don't use these by default anymore, and there's been complaints from a
number of places thinking that the firmware blobs are required still.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:05 +10:00
1b45dbe0bc
drm/nouveau/dp: use alternate lane mask for nvaf
...
Naturally... Because Macs can't just be the same as everything else
now can they?
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:11:00 +10:00
856ed88875
drm/nouveau/dp: link rate scripts are selected with a comparison table
...
Not hardcoded as originally thought.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:56 +10:00
1262a206da
drm/nv40/pm: write nv40-specific reclocking routines
...
Not 100% perfect yet, but a good start towards what it'll look like in the
end.
Actually seems stable on a NV44 I have here, as much as running around OA
for a fair amount of time constantly switching between performance levels
can prove..
My NV49 isn't quite so happy, and semaphores mess up somehow (sometimes) as
a result of the memory reclocking.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:45 +10:00
9f403603f2
drm/nv40/pm: parse geometric delta clock from vbios
...
This changes the meaning of what we reported as "core" clock previously.
The shader/rop units are allegedly supposed to be run at the base clock
listed in the perf table, while the geometric clock can be bumped from
this value on some boards.
So that we can report both, we'll report the base clock as "shader" (since
the shaders *do* run at it), and the geometric clock as "core".
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:40 +10:00
52e0d0ecc8
drm/nouveau/dp: enable down-spread if vbios and sink support it
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:35 +10:00
28e2d12405
drm/nouveau/dp: execute some more vbios tables relating to link rate
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:27 +10:00
75a1fccf92
drm/nouveau/dp: store unencoded link_bw everywhere
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:24 +10:00
27a4598737
drm/nouveau/dp: restructure link training code
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:21 +10:00
a002feceb7
drm/nouveau/dp: pass in required datarate to link training
...
Not used currently, but it will be used in preference to pre-determined
lane/bandwidth numbers at a later point.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:19 +10:00
a8e415d3eb
drm/nouveau/bios: check for null script pointers in parser
...
Allows us to be lazy elsewhere...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:12 +10:00
5024c54b5c
drm/nva3/backlight: add suppport for newer style backlight regs
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:06 +10:00
09461459e1
drm/nv50/backlight: express brightness level in percent
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:10:02 +10:00
10b461e40a
drm/nv50/backlight: take the sor into account when bashing regs
...
I'm sure that out there somewhere, someone will need this. We currently
haven't seen an example of LVDS being on a non-0 SOR so far though.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:09:56 +10:00
730764812d
drm/nouveau/backlight: make more consistent with rest of driver style
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:09:53 +10:00
68c9918479
drm/nouveau: tidy connector hotplug handler, punt messages to debug
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:09:49 +10:00
46959b7790
drm/nouveau/dp: remove reliance on vbios for native displayport
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:09:42 +10:00
4372013388
drm/nouveau/dp: rewrite auxch transaction routines
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:09:03 +10:00
91a8f1ea4b
drm/nouveau: workaround semaphore hw bug causing unnecessary interrupts
...
The HW will only accept the DMA_FROM_MEMORY class for DMA_SEMAPHORE without
asking the driver to intervene.
It appears that semaphores will work correctly even without DMA_IN_MEMORY,
so lets avoid the large amount of interrupts generated by x-chan sync.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:59 +10:00
afb0c796d8
drm/nouveau/tmr: fix miscalculation of ratio on pre-nv4x chipsets
...
The clock_get() hook returns KHz, not Hz.
Also fixed to use crystal freq from dev_priv.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:54 +10:00
378f85ed54
drm/nva3/pm: fixup for NVAF special
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:50 +10:00
64e740bb3d
drm/nva3/pm: use crystal freq where appropriate
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:44 +10:00
f2cbe46f14
drm/nouveau: determine timing crystal freq from straps
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:41 +10:00
93e692dc5f
drm/nva3/pm: pll disabled if bit 0 of ctrl not set
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:37 +10:00
6b70e48167
drm/nouveau: magic to make auxch on new macbooks booted in EFI mode work
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:32 +10:00
2228c6fe04
drm/nouveau/pm: Document and expose CL and WR for 0x1002Cx
...
Signed-off-by: Roy Spliet <r.spliet@student.tudelft.nl>
2011-09-20 16:08:28 +10:00
9a78248876
drm/nouveau/pm: add initial NV3x/NVCx memtiming support, improve other cards
...
NV30: Create framework for memtm
NV50: Improve reg creation,
NV50: Use P.version instead of card codename/stepping,
NVC0: Initial memtiming code for Fermi,
Renamed regs for consistency,
Overall redesign to improve readability,
Avoid kfree on null-pointer
Signed-off-by: Roy Spliet <r.spliet@student.tudelft.nl>
2011-09-20 16:08:25 +10:00
1cb70b30e4
drm/nouveau: remove special-casing of hotplug detection type
...
If we support PGPIO interrupts, and know a hotplug GPIO tag for a
connector we use HPD, otherwise POLL_CONNECT.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:14 +10:00
bd57e7fc2e
drm/nvd0: no page flipping at the moment
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:11 +10:00
64c2502b77
drm/nvc0/gr: remove max tpc count info
...
Just assume a max of 16 everywhere, and hope it's okay.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:08 +10:00
e432d48f87
drm/nvd0: lets not attempt to dereference a nv50_display pointer
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:08:02 +10:00
658e86ee2d
drm/nouveau: enable hwmon support when both nouveau/hwmon are built as modules.
...
The nouveau hwmon temperature support currently only functions when hwmon is
compiled into the kernel. There's no reason why this shouldn't also work when
both hwmon and nouveau are modularised (as is the case with Slackware's stock
kernels).
Signed-off-by: Ken Milmore <ken.milmore@googlemail.com>
Reviewed-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:59 +10:00
37b034a64b
drm/nvd0/disp: tidy up what we have so far
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:49 +10:00
ee41779e76
drm/nvd0/disp: rewrite irq handler, should be somewhat sturdier now
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:46 +10:00
f20ce9629f
drm/nvd0/disp: do modeset irq handling from tasklet
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:42 +10:00
3b6d83d1b9
drm/nvd0/disp: untested LVDS support
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:36 +10:00
c6f2f71dae
drm/nvd0/disp: track down fb positioning method
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:32 +10:00
ff8ff50342
drm/nvd0/disp: determine U table config in or_mode_set()
...
Takes a gamble and presumes that we can safely store something random in
OR_MODE_CTRL+4, the hw doesn't seem to mind...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:29 +10:00
b681993f7a
drm/nvd0/disp: dac load detect
...
VBIOS does more than this, as does nv50/nvc0 driver in nouveau. Traces
of the NVIDIA binary driver however, show pretty much just this being
done... Seems to work for me, it'll be fine for the moment.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:22 +10:00
629c1b9207
drm/nvd0/disp: handle sync polarity, kill off some unknown
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:18 +10:00
f3fdc52dd7
drm/nvd0/disp: scaling
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:15 +10:00
a46232ee09
drm/nvd0/disp: push the update button in mode_set_base()
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:09 +10:00
8ea0d4aa60
drm/nvd0/disp: fixup clut so it actually works
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:05 +10:00
3a89cd0292
drm/nvd0/disp: initial attempt at modeset irq handling
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:07:01 +10:00
b6d8e7ec38
drm/nvd0/disp: stub dac load detect, prevents oops
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:57 +10:00
8eaa9669f8
drm/nvd0/disp: dac encoder module
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:50 +10:00
a36f04c044
drm/nvd0/disp: extend the init voodoo to cover crtcs
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:47 +10:00
c0cc92a115
drm/nvd0/disp: remove lp reordering from vram dmaobj, create fb dmaobjs
...
Fixes CLUT being messed up. Mostly.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:44 +10:00
1d6e7a59f7
drm/nvd0/disp: some magic to make evo happeir
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:37 +10:00
2fad3d5e2b
drm/nvd0/disp: they moved the linear flag..
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:33 +10:00
438d99e3b1
drm/nvd0/disp: initial crtc object implementation
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:30 +10:00
270a574780
drm/nvd0/disp: skeletal handling of modeset interrupts
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:24 +10:00
83fc083cbb
drm/nvd0/disp: start on SOR encoder functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:21 +10:00
efd272a7a0
drm/nvd0/disp: setup a couple of dma objects we'll need
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:07 +10:00
4600522a8f
drm/nvd0/disp: start on interrupt handling
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:06:01 +10:00
51beb428e4
drm/nvd0/disp: whip up some basic dma handling for the evo channels
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:57 +10:00
26f6d88b32
drm/nvd0/disp: very initial evo setup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:54 +10:00
02e4f5877d
drm/nouveau/bios: allow passing in crtc to the init table parser
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:48 +10:00
4784e4aa47
drm/nvd0/pm: enable clock/voltage hooks
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:44 +10:00
75139063b7
drm/nouveau/bios: fix INIT_GPIO for new chipsets
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:40 +10:00
d7f8172ca9
drm/nvd0/gpio: initial implementation
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:36 +10:00
eeb3ca12b4
drm/nvd0/i2c: initial implementation
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:24 +10:00
d9f61c2d28
drm/nouveau: initial chipset description for nvdX chipsets
...
All the non-stubbed functions should be okay for this chipset, the rest
will be added back as they're figured out.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:20 +10:00
03bc9675d3
drm/nouveau: allow modeset module option to select 'headless mode'
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:16 +10:00
1575b3646c
drm/nouveau: fixup init/fini sequence to deal with no CRTCs
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:09 +10:00
048a88595a
drm/nouveau: make general drm modesetting init common
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:05:04 +10:00
2e9733ff7d
drm/nvd0: add a card_type for 0xdX chipsets
...
These are different enough from 0xcX to justify it, half fermi, half
kepler(??)..
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:45 +10:00
f3f2f54e11
drm/nv04/pm: recalibrate timer on nvclk changes
...
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:42 +10:00
591b06d73b
drm/nouveau/tmr: calibrate for ns timestamps on init
...
We previously assumed (incorrectly a lot of the time) that PTIMER would
be programmed at a frequency which'd give its 64-bit timestamps in
nanoseconds.
By programming PTIMER ourselves, we avoid this problem.
Reviewed-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:36 +10:00
16cd399c65
drm/nvc0/gr: unblacklist nvcf acceleration
...
Reported to be working.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:32 +10:00
0b3b5579e1
drm/nouveau: don't complain for disabled timingset entries
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:29 +10:00
e425e0b339
drm/nvc0/gr: copy GPC mpart config from PFFB
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:15 +10:00
aa6500964c
drm/nvc0/vram: support non-uniform memory size per controller
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:11 +10:00
3c23a7b8bc
drm/nvc0/gr: add support for nvcf chipset
...
untested, written from a trace, accel disabled by default until it is
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:06 +10:00
a12036ba2c
drm/nouveau: allow a nouveau_mm to be created with holes
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:04:00 +10:00
987eec10dd
drm/nouveau: embed nouveau_mm
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:03:56 +10:00
52d073318a
drm/nv31/mpeg: support for a single class3174 user
...
Uncertain if/how the hw does multiple PMPEG channels, supporting one is
better than none however.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:03:44 +10:00
323dcac552
drm/nouveau: rename nv40_mpeg to nv31_mpeg
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:03:38 +10:00
9698b9a680
drm/nvc0/pm: more complete parsing of clock domains
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:03:34 +10:00
354d0781e5
drm/nvc0/pm: initial implementation of clocks_get()
...
Not too certain on memory clock yet, but it gets the right numbers for
each perflvl on my NVC0.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:03:16 +10:00
d0f67a48f4
drm/nva3/pm: idle graphics engine before changing clocks
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:02:53 +10:00
78e2933d07
drm/nouveau: add function to wait until a callback returns true
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:02:50 +10:00
95f0de3a0a
drm/nv50/gr: insert set/clr of a ctxprog flag at start/end of ctxprog
...
The set will be replaced with a wait on the same flag by a subsequent
commit in order to halt a ctxprog's execution temporarily.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:02:46 +10:00
cec2a270db
drm/nva3/pm: tidy and add some comments here and there
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:02:40 +10:00
4fd2847e9b
drm/nva3/pm: parse/reclock vdec/41a0 clocks
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:02:36 +10:00
ca94a71fc4
drm/nva3/pm: rewrite clock_set, and switch to new interfaces
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:01:51 +10:00
77e7da6814
drm/nouveau/pm: add hooks to get/set *all* clocks at once
...
This is probably better than having to tell the common code about all the
clocks that exist on every chipset.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:01:45 +10:00
3b0582d31d
drm/nva3/pm: rewrite clock readback functions, far more correct now
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-09-20 16:01:41 +10:00
Ben Skeggs