Commits · 34d595081812da62b5357579267c4ab5eae64ac1 · nexedi / linux

18 Feb, 2014 9 commits

drm/nouveau: fix TTM_PL_TT memtype on pre-nv50 · 34d59508

Ilia Mirkin authored Feb 15, 2014

Commit a5540906 ("drm/nv50-: map TTM_PL_SYSTEM through a BAR for CPU
access") made it possible to work with tiled memory. However
mem->mm_node is not a nouveau_mem for AGP-using pre-NV50 cards, but a
drm_mm_node, as created by the ttm_bo_manager_func. As such, extend the
untiled check to explicitly include all pre-nv50 cards.
Reported-by: Ronald <ronald645@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74613Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Tested-by: Ronald Uitermark <ronald645@gmail.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

34d59508

drm/nv50/disp: use correct register to determine DP display bpp · a7f1c1e6

Ilia Mirkin authored Feb 13, 2014

Commit 0a0afd28 ("drm/nv50-/disp: move DP link training to core and
train from supervisor") added code that uses the wrong register for
computing the display bpp, used for bandwidth calculation. Adjust to use
the same register as used by exec_clkcmp and nv50_disp_intr_unk20_2_dp.
Reported-by: Torsten Wagner <torsten.wagner@gmail.com>
Reported-by: Michael Gulick <mgulick@mathworks.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67628
Cc: stable@vger.kernel.org # 3.9+
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

a7f1c1e6

drm/nouveau/fb: use correct ram oclass for nv1a hardware · 95ca5b55

Emil Velikov authored Feb 12, 2014

commit 8613e731
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Mon Oct 21 08:50:25 2013 +1000

    drm/nouveau/fb: remove ram oclass argument from base fb constructor

Introduced a unfortunate regression by using nv10 ram oclass for nv1a
hardware, causing corruption and eventually system lockup.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74866Reported-by: John F. Godfrey <jfgodfrey@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Cc: stable@vger.kernel.org # 3.13+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

95ca5b55

drm/nv50/gr: add missing nv_error parameter priv · a8c13aac

Ilia Mirkin authored Feb 08, 2014

Commit ea7dce90 ("drm/nv50/gr: print mpc trap name when it's not an mp
trap") added an nv_error call that was missing the priv parameter. This
causes GPFs if the error is ever hit.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

a8c13aac

drm/nouveau: fix ENG_RUNLIST register address · bf787d7c

Alexandre Courbot authored Feb 07, 2014

Address of the ENG_RUNLIST register should be 0x002284 + (engine * 8),
not 0x002284 + (engine * 4).
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

bf787d7c

drm/nv4c/bios: disallow retrieving from prom on nv4x igp's · 5ac607ec

Ilia Mirkin authored Feb 05, 2014

Suggested-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

5ac607ec

drm/nv4c/vga: decode register is in a different place on nv4x igp's · b71313e1

Ilia Mirkin authored Feb 05, 2014

Suggested-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

b71313e1

drm/nv4c/mc: nv4x igp's have a different msi rearm register · fa8c9ac7

Ilia Mirkin authored Feb 05, 2014

See https://bugs.freedesktop.org/show_bug.cgi?id=74492Reported-by: Ronald <ronald645@gmail.com>
Suggested-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

fa8c9ac7

drm/nouveau: set irq_enabled manually · 7d3428cd

Ilia Mirkin authored Jan 29, 2014

Since commit 0fa9061a ("drm/nouveau/mc: handle irq-related setup
ourselves"), drm_device->irq_enabled remained unset. This is needed in
order to properly wait for a vblank event in the generic drm code.

See https://bugs.freedesktop.org/show_bug.cgi?id=74195Reported-by: Jan Janecek <janjanjanx@gmail.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

7d3428cd

29 Jan, 2014 5 commits

drm/nouveau: resume display if any later suspend bits fail · f3980dc5

Ilia Mirkin authored Jan 23, 2014

If either idling channels or suspending the fence were to fail, the
display would never be resumed. Also if a client fails, resume the fence
(not functionally important, but it would potentially leak memory).

See https://bugs.freedesktop.org/show_bug.cgi?id=70213Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

f3980dc5

drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip · 09c3de13

Maarten Lankhorst authored Jan 29, 2014

Fixes a regression introduced by d5c1e84b
"drm/nouveau: hold mutex while syncing to kernel channel".

Cc: stable@vger.kernel.org #3.13
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

09c3de13

drm/nouveau: implement hooks for needed for drm vblank timestamping support · d83ef853
Ben Skeggs authored Nov 14, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
d83ef853
drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping · d2fa7d32
Ben Skeggs authored Nov 14, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
d2fa7d32

drm/nv50: fill in crtc mode struct members from crtc_mode_fixup · eb2e9686

Ben Skeggs authored Jan 24, 2014

The DRM uses the adjusted mode to calculate constants for vblank
timestamping.  Our encoder mode_fixup (usually) replaces this data
with our backend mode information, which doesn't have the needed
data filled in already.

Reported-by: Mario Kleiner mario.kleiner.de@gmail.com
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

eb2e9686

23 Jan, 2014 26 commits
- drm/nouveau: call drm_vblank_cleanup() earlier · 1139ffb9
  Ben Skeggs authored Jan 23, 2014
```
Fixes a NULL-ptr deref seen on module unload sometimes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  1139ffb9
- drm/nouveau: create base display from common code · 2332b311
  Ben Skeggs authored Jan 22, 2014
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  2332b311
- drm/nv50/gr: print mpc trap name when it's not an mp trap · ea7dce90
  Ilia Mirkin authored Jan 17, 2014
```
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
```
  ea7dce90
- drm/nv50/gr: update list of mp errors, make it a bitfield · f750ecc9
  Ilia Mirkin authored Jan 17, 2014
```
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
```
  f750ecc9
- drm/nv50/gr: add more trap names to print on error · e2dd003d
  Ilia Mirkin authored Jan 16, 2014
```
Also avoids printing the errors bitfield if that information has already
been shown.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
```
  e2dd003d
- drm/nouveau/devinit: lock/unlock crtc regs for all devices, not just pre-nv50 · f87cd8b6
  Ilia Mirkin authored Jan 19, 2014
```
Also make nv_lockvgac work for nv50+ devices. This should fix
IO_CONDITION and related VBIOS opcodes that read/write the crtc regs.

See https://bugs.freedesktop.org/show_bug.cgi?id=60680Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  f87cd8b6
- drm/nouveau: hold mutex while syncing to kernel channel · d5c1e84b
  Maarten Lankhorst authored Jan 14, 2014
```
Not holding the mutex potentially causes corruption of the kernel
channel when page flipping.

Cc: stable@vger.kernel.org #3.13
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  d5c1e84b
- drm/nv50-/devinit: prevent use of engines marked as disabled by hw/vbios · 4019aaa2
  Ilia Mirkin authored Jan 14, 2014
```
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  4019aaa2
- drm/nouveau/device: provide a way for devinit to mark engines as disabled · f0d13e3a
  Ilia Mirkin authored Jan 09, 2014
```
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  f0d13e3a
- drm/nouveau/devinit: tidy up the subdev class definition · cf336014
  Ben Skeggs authored Jan 14, 2014
```
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  cf336014
- drm/nouveau/bar: tidy up the subdev and object class definitions · 52225551
  Ben Skeggs authored Dec 23, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  52225551
- drm/nouveau/instmem: tidy up the object class definition · ab606194
  Ben Skeggs authored Dec 23, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  ab606194
- drm/nouveau/instmem: tidy up the subdev class definition · 24a4ae86
  Ben Skeggs authored Dec 23, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  24a4ae86
- drm/nouveau/pwr: implement a simple i2c stack · 64c672ae
  Ben Skeggs authored Nov 09, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  64c672ae
- drm/nouveau/pwr: have rd/wr32 routines clobber data instead of addr · 2e9dfe23
  Ben Skeggs authored Dec 12, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  2e9dfe23
- drm/nve0/fb: turn off some bits in 10f584 at init · 73216231
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  73216231
- drm/nve0/fb/gddr5: merge a fix from ddr3 for one of the timing settings · cb54dd2f
  Ben Skeggs authored Dec 03, 2013
```
Titan.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  cb54dd2f
- drm/nve0/fb/gddr5: yet another random 10f200 bit · b13d0e4a
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  b13d0e4a
- drm/nvc0-/fb: hook up skeleton interrupt handler · c814a60d
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  c814a60d
- drm/nve0/fb/gddr5: more 10f200 stuff · 7f39e597
  Ben Skeggs authored Dec 03, 2013
```
Seen on Titan.  NFI what the condition to switch this on is yet, and,
hardcoding it to on currently causes master to report unknown intr
with a mask of 0x08002000.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  7f39e597
- drm/nve0/clk: report ddr memory frequency · 12642e36
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  12642e36
- drm/nouveau/fb/gddr5: make sure we update mr7 when we're supposed to · 1a894c06
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  1a894c06
- drm/nve0/fb/gddr5: 10f698/69c · a8ccbb77
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  a8ccbb77
- drm/nve0/fb: it's now safe to obey the memory voltage setting properly · cfe17608
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  cfe17608
- drm/nve0/fb: multi-stage reclock is required for certain transitions · 46bf1c38
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  46bf1c38
- drm/nouveau/clk: allow fb to signal it needs to do a multi-stage reclock · 1789cab4
  Ben Skeggs authored Dec 03, 2013
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
  1789cab4