OSDN Git Service

android-x86/kernel.git
8 years agodrm/nouveau/core: type-safe printk macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/core: type-safe printk macros

These require an explicit pointers to nvkm_object/nvkm_subdev/nvkm_device,
depending on which macros are used.  This is unlike the previous macros
which take a void *, and work for anything derived from nvkm_object (by
way of some awful heuristics).

The output will be a bit confused until everything has been transitioned,
as the logging format used is a more standard style that previously.

In addition, usage of pr_cont(), which doesn't work correctly with the
dev_*() printk functions (and was potentially racy to begin with), will
be replaced.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mpeg: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/mpeg: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/gr: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/gr: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fifo: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/fifo: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/disp: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/disp: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/falcon: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/falcon: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pmu: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/pmu: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mmu: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/mmu: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ltc: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/ltc: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ibus: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/ibus: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fb: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/fb: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/clk: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/clk: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bus: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:11 +0000 (14:54 +1000)]
drm/nouveau/bus: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bar: switch to new-style timer macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/bar: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/tmr: type-safe PTIMER-based delay/wait macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/tmr: type-safe PTIMER-based delay/wait macros

These require an explicit struct nvkm_device pointer, unlike the previous
macros which take a void *, and work for (almost) anything derived from
nvkm_object by using some heuristics.

These macros are more general than the previous ones, and can be used to
handle PTIMER-based busy-waits (will be used in later devinit fixes) as
well as more complicated wait conditions.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/kms/nv04: fix incorrect use of register accessors
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/kms/nv04: fix incorrect use of register accessors

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/sw: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/sw: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/sec: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/sec: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pm: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/pm: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/msvld: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/msvld: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/msppp: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/msppp: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mspdec: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/mspdec: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mpeg: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/mpeg: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/gr: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/gr: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fifo: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/fifo: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/disp: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/disp: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/device: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:10 +0000 (14:54 +1000)]
drm/nouveau/device: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/cipher: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/cipher: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ce: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/ce: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/xtensa: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/xtensa: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/falcon: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/falcon: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/tmr: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/tmr: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/therm: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/therm: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pmu: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/pmu: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mmu: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/mmu: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mc: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/mc: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ltc: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/ltc: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/imem: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/imem: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ibus: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/ibus: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/i2c: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/i2c: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/gpio: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/gpio: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fuse: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/fuse: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fb: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/fb: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/devinit: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)]
drm/nouveau/devinit: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/clk: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/clk: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bus: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/bus: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bios: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/bios: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bar: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/bar: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/core: switch to device pri macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/core: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/device: type-safe register accessor macros
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/device: type-safe register accessor macros

These require an explit struct nvkm_device pointer, unlike the previous
macros which take a void *, and assume it's any old nvkm_subdev.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/vp: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/vp: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/sw: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/sw: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/sec: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/sec: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pm: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/pm: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/msvld: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/msvld: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/msppp: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/msppp: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mspdec: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/mspdec: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mpeg: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/mpeg: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/gr: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:08 +0000 (14:54 +1000)]
drm/nouveau/gr: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fifo: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/fifo: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/dma: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/dma: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/disp: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/disp: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/cipher: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/cipher: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ce: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/ce: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bsp: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/bsp: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/xtensa: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/xtensa: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/falcon: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/falcon: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/volt: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/volt: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/tmr: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/tmr: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/therm: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/therm: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pmu: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/pmu: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mxm: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/mxm: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mmu: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/mmu: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/mc: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/mc: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ltc: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:07 +0000 (14:54 +1000)]
drm/nouveau/ltc: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/imem: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/imem: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/ibus: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/ibus: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/i2c: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/i2c: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/gpio: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/gpio: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fuse: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/fuse: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fb: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/fb: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/devinit: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/devinit: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/clk: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/clk: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bus: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/bus: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bios: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/bios: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bar: cosmetic changes
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/bar: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/device: include core/device.h automatically for subdevs/engines
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/device: include core/device.h automatically for subdevs/engines

Pretty much every subdev/engine is going to need access to nvkm_device
shortly to touch registers and/or output messages.

The odd placement of the includes is necessary to work around some
inter-dependencies that currently exist.  This will be fixed later.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/device: add direct pointer to struct device
Ben Skeggs [Thu, 20 Aug 2015 04:54:06 +0000 (14:54 +1000)]
drm/nouveau/device: add direct pointer to struct device

A future commit will hide the platform/pci specifics from nvkm_device,
but it's still very useful in a lot of places to have access to the
Linux device struct.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/device: add direct pointers to subdevs from nvkm_device
Ben Skeggs [Thu, 20 Aug 2015 04:54:05 +0000 (14:54 +1000)]
drm/nouveau/device: add direct pointers to subdevs from nvkm_device

Will be used in upcoming commits to remove the need for lookup/runtime
type-checking functions when accessing foreign subdevs.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/subdev: add direct pointer to nvkm_device
Ben Skeggs [Thu, 20 Aug 2015 04:54:05 +0000 (14:54 +1000)]
drm/nouveau/subdev: add direct pointer to nvkm_device

Will be utilised in upcoming commits to remove the need for heuristics
to lookup the device a subdev belongs to.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/lib: various tweaks
Ben Skeggs [Thu, 20 Aug 2015 04:54:05 +0000 (14:54 +1000)]
drm/nouveau/lib: various tweaks

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pmu/gk104: implement a hackish workaround for a hw bug
Ben Skeggs [Thu, 27 Aug 2015 07:33:19 +0000 (17:33 +1000)]
drm/nouveau/pmu/gk104: implement a hackish workaround for a hw bug

Only a handful of machines have this enabled by default, where it's been
proven to work.  The workaround can be explicitly enabled with a module
option also.

Still waiting on feedback from NVIDIA for a proper idea of exactly what
this fix is doing, and how to implement it properly.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/disp/dp: gm1xx appears to have same dp lane ordering as gm2xx
Ben Skeggs [Fri, 21 Aug 2015 03:38:31 +0000 (13:38 +1000)]
drm/nouveau/disp/dp: gm1xx appears to have same dp lane ordering as gm2xx

Fixes 2-lane DP on Quadro K620.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/disp/dp: fix some tx_pu mishandling
Ben Skeggs [Fri, 21 Aug 2015 02:50:07 +0000 (12:50 +1000)]
drm/nouveau/disp/dp: fix some tx_pu mishandling

We only need to mask 0x0f on GM2xx, and want to keep the higher bits on
earlier cards.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bios/dp: use alternate set of drvctl values where necessary
Ben Skeggs [Fri, 21 Aug 2015 03:19:13 +0000 (13:19 +1000)]
drm/nouveau/bios/dp: use alternate set of drvctl values where necessary

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/bios/dcb: accept "maxwell" lane count values for dcb 4.0
Ben Skeggs [Fri, 21 Aug 2015 00:52:54 +0000 (10:52 +1000)]
drm/nouveau/bios/dcb: accept "maxwell" lane count values for dcb 4.0

We previously assumed that the values "2" and "4" were new in DCB 4.1,
however, there's at least one GM107 DCB 4.0 board (Quadro K620) that
uses the newer values.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/fb/sddr3: add WR/CWL values seen on a GK208
Ilia Mirkin [Mon, 17 Aug 2015 23:37:34 +0000 (19:37 -0400)]
drm/nouveau/fb/sddr3: add WR/CWL values seen on a GK208

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/nv46: Change mc subdev oclass from nv44 to nv4c
Hans de Goede [Thu, 23 Jul 2015 15:20:12 +0000 (17:20 +0200)]
drm/nouveau/nv46: Change mc subdev oclass from nv44 to nv4c

MSI interrupts appear to not work for nv46 based cards. Change the mc
subdev oclass for these cards from nv44 to nv4c, the nv4c mc code is
identical to the nv44 mc code except that it does not use msi
(it does not define a msi_rearm callback).

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=90435
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
8 years agodrm/nouveau/pm/gf100: only use PBFB_BROADCAST.PM_UNK100 for PBFB signals
Samuel Pitoiset [Tue, 4 Aug 2015 21:58:15 +0000 (23:58 +0200)]
drm/nouveau/pm/gf100: only use PBFB_BROADCAST.PM_UNK100 for PBFB signals

High level hardware events related to PBFB will monitor all partitions.
While we are at it, fix bitfield for this mux.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>