aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-27drm/bridge: PTN3460 needs DRM_KMS_HELPERArnd Bergmann1-1/+2
The recently added PTN3460 device driver uses interfaces that are provided by the KMS helper infrastructure, so we should explicitly select that to avoid this linker error: ERROR: "drm_helper_probe_single_connector_modes" [drivers/gpu/drm/bridge/ptn3460.ko] undefined! ERROR: "drm_helper_connector_dpms" [drivers/gpu/drm/bridge/ptn3460.ko] undefined! We have to drop the I2C dependency to avoid a circular dependency chain, but that's ok because DRM already selects I2C. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2014-03-26Merge branch 'drm-nouveau-next' of ↵Dave Airlie154-4412/+10033
git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next - first stage of (ongoing) gpu fault recovery work - initial support for maxwell (binary driver fw needed) - various random fixes across the board * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (87 commits) drm/nouveau: fix missing newline drm/nouveau/bios: fetch the vbios from PROM using only aligned 32-bit accesses drm/nouveau/therm: let the vbios decide on the automatic fan management mode drm/nvd7/therm: handle another kind of PWM fans drm/nouveau/pm/fan: drop the fan lock in fan_update() before rescheduling drm/nouveau: fix small thinko in vblank timestamping. drm/nouveau/therm: check for sensor presence with requested mode, not current drm/nouveau/disp/dp: allow 540MHz data rate drm/nouveau: recognise higher link rate for available dp bw calculations drm/nouveau/disp: limit dp capabilities as per dcb drm/nva3/fbram: restrict training pattern setup to GT218 drm/nva3/devinit: restrict script access to some PFB regs drm/nouveau/devinit: add interface to check if a mmio access by scripts is ok drm/nouveau/bios: have strap reads show on devinit spam debug level drm/nv50/gpio: fixup reset for gpios >= 16 drm/nv50/gpio: exclude sense value from mask when changing registers drm/gk104/gr: therm magic needed on some kepler boards drm/gm107/gr: initial support drm/gf100-/gf: fix a stupid typo, waiting on wrong signal for mmctx drm/nouveau/bios: parsing of some random table needed to bring up gr ...
2014-03-26drm/nouveau: fix missing newlineAlexandre Courbot1-1/+1
Add a missing newline at the end of a DRM_INFO message. Signed-off-by: Alexandre Courbot <[email protected]> Reviewed-by: Thierry Reding <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: fetch the vbios from PROM using only aligned 32-bit accessesMartin Peres1-14/+19
Other kind of accesses are unreliable on Kepler cards. As advised by NVIDIA, let's only use 32-bit accesses to fetch the vbios from PROM. This fixes vbios fetching on my nve7 which failed in certain specific conditions. I suggest we Cc stable, for all kernels they still maintain after the big rewrite. Suggested-by: Christian Zander <[email protected]> Signed-off-by: Martin Peres <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/therm: let the vbios decide on the automatic fan management modeMartin Peres4-8/+25
This should fix automatic fan management on fermi cards who do not have 0x46 entries in the thermal table. On my nve6, the blob sets the default linear range from 40°C to 100°C but my nvcf's default values are 40°C to 85°C. Let's keep 85 as a default for everyone. Signed-off-by: Martin Peres <[email protected]> Tested-by: Timothée Ravier <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nvd7/therm: handle another kind of PWM fansMartin Peres6-16/+35
This should fix fan management on many nvd7+ chipsets. Signed-off-by: Martin Peres <[email protected]> Tested-by: Timothée Ravier <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/pm/fan: drop the fan lock in fan_update() before reschedulingMartin Peres1-6/+13
This should fix a deadlock that has been reported to us where fan_update() would hold the fan lock and try to grab the alarm_program_lock to reschedule an update. On an other CPU, the alarm_program_lock would have been taken before calling fan_update(), leading to a deadlock. We should Cc: <[email protected]> # 3.9+ Reported-by: Marcin Slusarz <[email protected]> Tested-by: Timothée Ravier <[email protected]> Tested-by: Boris Fersing (IRC nick fersingb, no public email address) Signed-off-by: Martin Peres <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: fix small thinko in vblank timestamping.Mario Kleiner1-1/+1
*hpos horizontal scanout position doesn't need to be corrected to count the pixels between hactive end and htotal negative. That is only needed for *vpos to count lines until end of vblank for the vblank timestamping. Use hpos as is without correction. Removes occassional spikes in timestamps of up to 1 scanline duration, thereby improves accuracy to about +/- 2 usecs instead of +/- 12 usecs, wrt. true onset time as measured with high precision equipment on NV-A5. Signed-off-by: Mario Kleiner <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/therm: check for sensor presence with requested mode, not currentBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/disp/dp: allow 540MHz data rateIlia Mirkin1-1/+1
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76319 Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: recognise higher link rate for available dp bw calculationsBen Skeggs1-1/+4
I should resurrect/merge that cleanup branch to remove the weird duplication.. One day. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/disp: limit dp capabilities as per dcbBen Skeggs2-1/+36
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nva3/fbram: restrict training pattern setup to GT218Ben Skeggs1-15/+17
It doesn't look like the others have the registers. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nva3/devinit: restrict script access to some PFB regsBen Skeggs2-0/+51
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/devinit: add interface to check if a mmio access by scripts is okBen Skeggs4-3/+11
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: have strap reads show on devinit spam debug levelBen Skeggs7-11/+13
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/gpio: fixup reset for gpios >= 16Ben Skeggs1-2/+3
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/gpio: exclude sense value from mask when changing registersBen Skeggs1-1/+1
Shouldn't effect anything, was just momentarily confusing while looking at traces. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gk104/gr: therm magic needed on some kepler boardsBen Skeggs1-1/+24
Not needed everywhere, and potentially not safe to do depending on how the rest of PTHERM is configured... Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm107/gr: initial supportBen Skeggs13-7/+2942
Our ucode only partially works at this point, so requiring binary fw image for now. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf100-/gf: fix a stupid typo, waiting on wrong signal for mmctxBen Skeggs11-11/+11
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: parsing of some random table needed to bring up grBen Skeggs3-0/+133
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/bar: fix plymouth issues on certain efi macbooksBen Skeggs1-1/+3
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: fix fbcon not being accelerated after suspendBen Skeggs1-2/+2
This does *not* (and is not intended to) fix the issue reported by Christoph Rudorff on the nouveau mailinglist. The patch proposed (which is similar to this one, but also reorders whether we disable accel or call fb_set_suspend first), papers over another problem entirely by avoiding touching the framebuffer. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf100-/gr: split ppc state into its subunitsBen Skeggs10-44/+62
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf100-/gf: split tpc state into its subunitsBen Skeggs19-270/+374
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf100-/gr: split gpc state into its subunitsBen Skeggs19-348/+348
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf100-/gr: tidy reg/ctx initval lists, mostly by giving them namesBen Skeggs20-2063/+1854
Unit names come from the Android GK20A driver. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gk110/gr: minor adjustment to some random initvalBen Skeggs1-2/+2
Change from traces of a newer binary driver version. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gk104/gr: minor adjustment to some random initvalBen Skeggs1-1/+1
Change from traces of a newer binary driver version. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf119/gr: fix bug in some random initvalBen Skeggs1-1/+1
Bug noticed vs traces. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf110/gr: fixup gpc/tpc initvals listsBen Skeggs1-42/+47
Differences noted vs traces. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gk208/gr: minor adjustment to some random initvalBen Skeggs1-1/+1
Change from traces of a newer binary driver version. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf108/gr: minor adjustment to some random initvalBen Skeggs1-1/+2
Bug noticed vs traces. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gf104/gr: rename gf104 (nvc4), it came before gf106 (nvc3)Ben Skeggs7-23/+23
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nvc0-/graph: fix gpccs fuc stack setupBen Skeggs7-935/+941
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: add more checks to PRAMIN image fetchingBen Skeggs1-1/+11
Prevents an attempt to access VRAM on an un-posted board, which, on a particular system with a GRID K1 installed, causes a MCE and chokes the entire system. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26support for platform devicesAlexandre Courbot35-127/+305
Upcoming mobile Kepler GPUs (such as GK20A) use the platform bus instead of PCI to which Nouveau is tightly dependent. This patch allows Nouveau to handle platform devices by: - abstracting PCI-dependent functions that were typically used for resource querying and page mapping, - introducing a nv_device_is_pci() function that allows to make PCI-dependent code conditional, - providing a nouveau_drm_platform_probe() function that takes a GPU platform device to be probed. Core code as well as engine/subdev drivers are updated wherever possible to make use of these functions. Some older drivers are too dependent on PCI to be properly updated, but all newer code on which future chips may depend should at least be runnable with platform devices. Signed-off-by: Alexandre Courbot <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: support modesetting on GM107Ben Skeggs2-0/+2
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm100/device: recognise GM107Ben Skeggs5-0/+113
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm107/disp: initial implementationBen Skeggs5-0/+118
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm107/ltcg: initial implementationBen Skeggs7-75/+231
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: add HDMI-C (mini) connector typeBen Skeggs2-1/+3
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm107/fb: initial implementationBen Skeggs8-8/+109
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gk20a/timer: initial implementationBen Skeggs6-49/+126
A bit different from NVIDIA's RFC patch, but I want this now for GM107. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm100/bios: hw disable register has movedBen Skeggs1-3/+9
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/gm107/devinit: initial implementationBen Skeggs5-1/+61
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nve0/fifo: bind intrBen Skeggs1-2/+27
Error code names from Android GK20A driver. Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nve0/fifo: attempt to recover from engine ctxsw timeoutsBen Skeggs1-0/+44
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26Merge branch 'drm-next-3.15' of ↵Dave Airlie7-203/+202
git://people.freedesktop.org/~deathsimple/linux into drm-next this is the third pull request for 3.15 radeon changes. Highlights this time: - More DP work from Alex, especially making use of the new DP aux helpers - Marek's 1D and linear tiling fixes for CIK * 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux: drm/radeon: set PIPE_CONFIG for 1D and linear tiling modes on CIK drm/radeon: use drm_dp_dpcd_read_link_status() drm/radeon: use the new drm helpers for dp aux drm/dp: make aux retries less chatty drm/radeon: clarify special handling in i2c over aux drm/radeon/atom: rework encoder enable/disable sequence drm/radeon/dp: move sink power control to a separate function drm/radeon/dp: use i2c_get_adapdata rather than casting