summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* drm/vmwgfx: fix warning if config intel iommu is off.Dave Airlie2013-11-081-0/+2
| | | | | | Though I'm not really happy with how ugly this code is now. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/nouveau: consider CLASS_DISPLAY_3D devices while detecting dsm/optimusEmil Velikov2013-11-081-0/+10
| | | | | | | | | | | | | | The present code assumes that optimus is present whenever two VGA (PCI_CLASS_DISPLAY_VGA) devices are present. This does not seem to be the case of newer laptops with optimus, in which case the nvidia gpu is a PCI_CLASS_DISPLAY_3D device. Rework the logic so that we count both VGA and 3D devices, when contemplating if optimus is present on the platform. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70208 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge branch 'drm-nouveau-next' of ↵Dave Airlie2013-11-08233-6862/+19471
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next - Ilia's PMPEG improvements - MSI fixes, and another attempt at enabling by default - Initial GK208 support, just modesetting - "Old" PM code gone, new infrastructure and various different stages of support (depending which chipset / ram type etc) is in its place. This includes support that goes beyond what the previous code was capable of. User control has been deliberately sabotaged, it's not safe to use still. - Thermal management / fan control that's been present for a while is turned ON by default now. - Misc other fixes that have accumulated * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (74 commits) drm/nouveau/fb: implement various bits of work towards memory reclocking drm/nouveau: implement a simple sysfs interface to new pm code drm/nouveau/device: initial control object class, with pstate control methods drm/nouveau/clk: implement power state and engine clock control in core drm/nouveau/volt: implement voltage control in core drm/nouveau/bios: parsing for various tables required for power management drm/nouveau/perfmon: initial infrastructure to expose performance counters drm/nouveau/bus: add interfaces/helpers for sequencer drm/nouveau/bus: make external class definitions pointers drm/nouveau/pwr: initial implementation drm/nouveau/therm: update target fanspeed outside of therm lock drm/nouveau/therm: automatic mode by default drm/nouveau/therm: no toggle fan control either if we can't guarantee no pwm connected drm/nvc0/therm: allow fan control if we've killed the vbios ppwr ucode drm/nouveau/therm: if no bios trip/linear info, default to perf-suggested speed drm/nouveau/therm: add hook for clk to suggest fanspeed to therm drm/nouveau/pwr: assign a subdev id for upcoming implementation drm/nouveau/gpio: return different error code for not found vs invalid drm/nouveau/drm/pm: remove everything except the hwmon interfaces to THERM drm/nouveau/core: make all info-level messages silent for runtime pm ...
| * drm/nouveau/fb: implement various bits of work towards memory reclockingBen Skeggs2013-11-0821-60/+3093
| | | | | | | | | | | | Not even remotely ready for the vast majority of the world. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: implement a simple sysfs interface to new pm codeBen Skeggs2013-11-085-5/+191
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/device: initial control object class, with pstate control methodsBen Skeggs2013-11-085-2/+196
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/clk: implement power state and engine clock control in coreBen Skeggs2013-11-0819-65/+2590
| | | | | | | | | | | | User control of this has been hard-coded as disabled for now. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/volt: implement voltage control in coreBen Skeggs2013-11-089-0/+460
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/bios: parsing for various tables required for power managementBen Skeggs2013-11-0816-8/+969
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/perfmon: initial infrastructure to expose performance countersBen Skeggs2013-11-0822-2/+1616
| | | | | | | | | | | | Internal use only at this point. Userspace later. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/bus: add interfaces/helpers for sequencerBen Skeggs2013-11-089-15/+371
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/bus: make external class definitions pointersBen Skeggs2013-11-0814-176/+133
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/pwr: initial implementationBen Skeggs2013-11-0830-0/+7091
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/therm: update target fanspeed outside of therm lockBen Skeggs2013-11-081-6/+8
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/therm: automatic mode by defaultBen Skeggs2013-11-081-1/+1
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/therm: no toggle fan control either if we can't guarantee no pwm ↵Ben Skeggs2013-11-081-0/+7
| | | | | | | | | | | | connected Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvc0/therm: allow fan control if we've killed the vbios ppwr ucodeBen Skeggs2013-11-081-3/+4
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/therm: if no bios trip/linear info, default to perf-suggested speedBen Skeggs2013-11-082-3/+15
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/therm: add hook for clk to suggest fanspeed to thermBen Skeggs2013-11-084-1/+17
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/pwr: assign a subdev id for upcoming implementationBen Skeggs2013-11-081-0/+1
| | | | | | | | | | | | THERM will use this before it exists. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/gpio: return different error code for not found vs invalidBen Skeggs2013-11-081-1/+1
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/drm/pm: remove everything except the hwmon interfaces to THERMBen Skeggs2013-11-0815-4837/+69
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/core: make all info-level messages silent for runtime pmBen Skeggs2013-11-088-76/+54
| | | | | | | | | | | | Removes the need for special handling of messages in init paths. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/fifo: make external class definitions into pointersBen Skeggs2013-11-0817-86/+86
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/device: recognise GK208Ben Skeggs2013-11-082-13/+48
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvc0-/gr: fix a number of missing explicit array terminators...Ben Skeggs2013-11-083-0/+6
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: fix (incorrect) reporting of unknown pending intr bitsBen Skeggs2013-11-081-6/+11
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/disp: semi-complete link training sequence even if display ↵Ben Skeggs2013-11-081-16/+32
| | | | | | | | | | | | disappears Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/bios: some older boards have shorter displayport tablesBen Skeggs2013-11-081-3/+7
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/fbcon: bracket entrypoints with a per-device enabled checkBen Skeggs2013-11-081-16/+27
| | | | | | | | | | | | | | | | We don't necessarily have fbcon on all devices these days. Fixes suspend on (at least) Quadro NVS 450. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvd0-/disp: reorder writes to lane current control regsBen Skeggs2013-11-081-4/+8
| | | | | | | | | | | | | | Matches the nv94-nvc0 commit with the same title. Doesn't fix a reported issue, but NVIDIA use this ordering here too, so let's do it just in case. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv94-nvc0/disp: reorder writes to lane current control regsBen Skeggs2013-11-081-4/+8
| | | | | | | | | | | | Fixes link training issues on some boards. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/disp: log if DP link training failsBen Skeggs2013-11-081-1/+3
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/i2c: use a custom bitbanging delay for the adt7473Martin Peres2013-11-085-49/+77
| | | | | | | | | | | | | | | | This patch adds a way to define a custom delay when scanning for i2c devices because the adt7473 sometimes doesn't like the default bitbanging udelay. Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/agp: add a quirk list to limit agp modesIlia Mirkin2013-11-081-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | Certain combinations of hardware can't actually support the maximum detected speed. Add a quirk list that lists pairs of hostbridge/chip pci ids and the mode that they should work with. See https://bugs.freedesktop.org/show_bug.cgi?id=20341 Reported-by: Jason Detring <detringj@gmail.com> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvd9-/disp: disable display underflow reporting at initBen Skeggs2013-11-081-0/+9
| | | | | | | | | | Reported-by: Andy Ritger <aritger@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nva0/clk: fix accidental limiting of pll coefficientsBen Skeggs2013-11-081-13/+16
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50-nvaf/fb: split fbram oclass in preparation for reclockingBen Skeggs2013-11-089-52/+184
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/fb: merge more bits and pieces into oclass definitionsBen Skeggs2013-11-0827-519/+272
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/fb: remove ram oclass argument from base fb constructorBen Skeggs2013-11-0824-107/+135
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50-nvaf/fb: split the class definitions up a bitBen Skeggs2013-11-089-44/+203
| | | | | | | | | | | | These will diverge further in the future. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/fb: make external class definitions pointersBen Skeggs2013-11-0826-113/+113
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvaa/mc: blacklist msi to off by defaultBen Skeggs2013-11-081-11/+19
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50-nv86,nv92/mc: rearm msi via pci config space, rather than mmio mirrorBen Skeggs2013-11-086-4/+52
| | | | | | | | | | | | | | | | | | This is what NVIDIA do on these chipsets, let's hope it works around the reported MSI failures for us on NV86. v2: updated to include G92, as per information provided by NVIDIA. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nvc0,nvc4/mc: handle 0xc0's "special" msi rearmBen Skeggs2013-11-0813-32/+134
| | | | | | | | | | | | | | v2. updated to cover GF104, as per information provided by NVIDIA. Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: store static data in nouveau_mc class definitionBen Skeggs2013-11-0816-215/+151
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: fetch NV_PMC_INTR again after re-arming MSIBen Skeggs2013-11-081-4/+6
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: bracket interrupt handler with NV_PMC_INTR_EN disable/re-enableBen Skeggs2013-11-081-0/+4
| | | | | | | | | | | | This looks to be what NVIDIA do pretty much everywhere, since forever. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: have single entry and exit points to the interrupt handlerBen Skeggs2013-11-081-18/+19
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau/mc: msi rearm write via subdev, not deviceBen Skeggs2013-11-081-2/+2
| | | | | | | | | | | | This way we can catch it with debugging on for PMC subdev. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
OpenPOWER on IntegriCloud