search for: nouveau_led

From: Karol Herbst <karolherbst at gmail.com> Fixes a kernel crash on suspend/resume. --- drm/nouveau/nouveau_led.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c index 9eed5a6..5e28b5f 100644 --- a/drm/nouveau/nouveau_led.c +++ b/drm/nouveau/nouveau_led.c @@ -107,7 +107,8 @@ nouveau_led_suspend(struct drm_device *dev) { struc...

...like it. Signed-off-by: Martin Peres <martin.peres at free.fr> --- drm/nouveau/Kbuild | 1 + drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + drm/nouveau/nouveau_drm.c | 7 ++ drm/nouveau/nouveau_drm.h | 3 + drm/nouveau/nouveau_led.c | 131 ++++++++++++++++++++++++++++ drm/nouveau/nouveau_led.h | 48 ++++++++++ 6 files changed, 191 insertions(+) create mode 100644 drm/nouveau/nouveau_led.c create mode 100644 drm/nouveau/nouveau_led.h diff --git a/drm/nouveau/Kbuild b/drm/nouveau/Kbuild...

...LEDS_CLASS" everywhere. > > > > Another option is to use the IS_REACHABLE() macro instead of IS_ENABLED() > > in the header file, to stub out the calls into the new file, but > > that can be a bit confusing. > > Why don't you just add empty inline stubs for nouveau_led_init / _fini / > _suspend / _resume? > That's what I was suggesting: diff --git a/drivers/gpu/drm/nouveau/nouveau_led.h b/drivers/gpu/drm/nouveau/nouveau_led.h index 9c9bb6ac938e..bc5f47cb516b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_led.h +++ b/drivers/gpu/drm/nouveau/nouveau_led....

Reviewed-by: Karol Herbst <karolherbst at gmail.com> 2016-09-16 9:34 GMT+02:00 Martin Peres <martin.peres at free.fr>: > Signed-off-by: Martin Peres <martin.peres at free.fr> > --- > drm/nouveau/nouveau_led.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c > index 5e28b5f..1f731da 100644 > --- a/drm/nouveau/nouveau_led.c > +++ b/drm/nouveau/nouveau_led.c > @@ -44,7 +44,10 @@ nouveau_led_get_brightne...

...fde6e36..0935396 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -22,7 +22,7 @@ nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o nouveau-y += nouveau_drm.o nouveau-y += nouveau_hwmon.o nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o -nouveau-$(CONFIG_LEDS_CLASS) += nouveau_led.o +nouveau-$(CONFIG_DRM_NOUVEAU_LEDS) += nouveau_led.o nouveau-y += nouveau_nvif.o nouveau-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o nouveau-y += nouveau_usif.o # userspace <-> nvif diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 2922a82.....

...martin.peres at free.fr> --- For real this time! Sorry for the noise drm/nouveau/Kbuild | 1 + drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + drm/nouveau/nouveau_drm.c | 7 ++ drm/nouveau/nouveau_drv.h | 3 + drm/nouveau/nouveau_led.c | 140 ++++++++++++++++++++++++++++ drm/nouveau/nouveau_led.h | 48 ++++++++++ 6 files changed, 200 insertions(+) create mode 100644 drm/nouveau/nouveau_led.c create mode 100644 drm/nouveau/nouveau_led.h diff --git a/drm/nouveau/Kbuild b/drm/nouveau/Kbuild...

...n Peres <martin.peres at free.fr> > --- > drm/nouveau/Kbuild | 1 + > drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + > drm/nouveau/nouveau_drm.c | 7 ++ > drm/nouveau/nouveau_drm.h | 3 + > drm/nouveau/nouveau_led.c | 131 ++++++++++++++++++++++++++++ > drm/nouveau/nouveau_led.h | 48 ++++++++++ > 6 files changed, 191 insertions(+) > create mode 100644 drm/nouveau/nouveau_led.c > create mode 100644 drm/nouveau/nouveau_led.h > > diff --git a/drm/nouveau...

...n Peres <martin.peres at free.fr> > --- > drm/nouveau/Kbuild | 1 + > drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + > drm/nouveau/nouveau_drm.c | 7 ++ > drm/nouveau/nouveau_drm.h | 3 + > drm/nouveau/nouveau_led.c | 131 ++++++++++++++++++++++++++++ > drm/nouveau/nouveau_led.h | 48 ++++++++++ > 6 files changed, 191 insertions(+) > create mode 100644 drm/nouveau/nouveau_led.c > create mode 100644 drm/nouveau/nouveau_led.h > > diff --git a/drm/nouveau...

...ree.fr> >> --- >> drm/nouveau/Kbuild | 1 + >> drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + >> drm/nouveau/nouveau_drm.c | 7 ++ >> drm/nouveau/nouveau_drm.h | 3 + >> drm/nouveau/nouveau_led.c | 131 ++++++++++++++++++++++++++++ >> drm/nouveau/nouveau_led.h | 48 ++++++++++ >> 6 files changed, 191 insertions(+) >> create mode 100644 drm/nouveau/nouveau_led.c >> create mode 100644 drm/nouveau/nouveau_led.h >> >&...

...n Peres <martin.peres at free.fr> > --- > drm/nouveau/Kbuild | 1 + > drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + > drm/nouveau/nouveau_drm.c | 7 ++ > drm/nouveau/nouveau_drm.h | 3 + > drm/nouveau/nouveau_led.c | 131 ++++++++++++++++++++++++++++ > drm/nouveau/nouveau_led.h | 48 ++++++++++ > 6 files changed, 191 insertions(+) > create mode 100644 drm/nouveau/nouveau_led.c > create mode 100644 drm/nouveau/nouveau_led.h > > diff --git a/drm/nouveau...

...ywhere. >> > >> > Another option is to use the IS_REACHABLE() macro instead of IS_ENABLED() >> > in the header file, to stub out the calls into the new file, but >> > that can be a bit confusing. >> >> Why don't you just add empty inline stubs for nouveau_led_init / _fini / >> _suspend / _resume? >> > > That's what I was suggesting: > > diff --git a/drivers/gpu/drm/nouveau/nouveau_led.h b/drivers/gpu/drm/nouveau/nouveau_led.h > index 9c9bb6ac938e..bc5f47cb516b 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_led.h > ++...

...at vger.kernel.org> # 4.9.x- Reported-by: Arnd Bergmann <arnd at arndb.de> Reported-by: Intel's 0-DAY Fixes: 8d021d71b324 ("drm/nouveau/drm/nouveau: add a LED driver for the NVIDIA logo") Signed-off-by: Martin Peres <martin.peres at free.fr> --- drivers/gpu/drm/nouveau/nouveau_led.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_led.h b/drivers/gpu/drm/nouveau/nouveau_led.h index 187ecdb..21a5775 100644 --- a/drivers/gpu/drm/nouveau/nouveau_led.h +++ b/drivers/gpu/drm/nouveau/nouveau_led.h @@ -42,7 +42,7 @@ nouveau_led(str...

The newly introduced LED handling for nouveau fails to link when the driver is built-in but the LED subsystem is a loadable module: drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_do_suspend': tvnv17.c:(.text.nouveau_do_suspend+0x10): undefined reference to `nouveau_led_suspend' drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_do_resume': tvnv17.c:(.text.nouveau_do_resume+0xf0): undefined reference to `nouveau_led_resume' drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_drm_unload': tvnv17.c:(.text.nouveau_drm_unload+0x34): undefined...

Signed-off-by: Martin Peres <martin.peres at free.fr> --- drm/nouveau/nouveau_led.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c index 5e28b5f..1f731da 100644 --- a/drm/nouveau/nouveau_led.c +++ b/drm/nouveau/nouveau_led.c @@ -44,7 +44,10 @@ nouveau_led_get_brightness(struct led_classdev *led) div...

Signed-off-by: Martin Peres <martin.peres at free.fr> --- drm/nouveau/nouveau_led.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c index 1f731da..3e2f1b6 100644 --- a/drm/nouveau/nouveau_led.c +++ b/drm/nouveau/nouveau_led.c @@ -82,6 +82,9 @@ nouveau_led_init(struct drm_device *dev) struct dcb_gpio_func logo_led;...

On 16/09/16 10:42, Karol Herbst wrote: > Reviewed-by: Karol Herbst <karolherbst at gmail.com> > > 2016-09-16 9:34 GMT+02:00 Martin Peres <martin.peres at free.fr>: >> Signed-off-by: Martin Peres <martin.peres at free.fr> >> --- >> drm/nouveau/nouveau_led.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c >> index 5e28b5f..1f731da 100644 >> --- a/drm/nouveau/nouveau_led.c >> +++ b/drm/nouveau/nouveau_led.c >> @@ -44,7 +44,1...

...m> Signed-off-by: Martin Peres <martin.peres at free.fr> --- Ben, I do not have a 4.10 kernel available to at least test-compile the patch. Could you make sure it works before applying it? After all the trouble we got from the LED before, I don't want to add another one! drm/nouveau/nouveau_led.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drm/nouveau/nouveau_led.c b/drm/nouveau/nouveau_led.c index 72456b16..2c5e0628 100644 --- a/drm/nouveau/nouveau_led.c +++ b/drm/nouveau/nouveau_led.c @@ -102,6 +102,7 @@ nouveau_led_init(struct drm_device *dev) ret = led_classdev_register(dev-...

...drm/nouveau/Kconfig > > +++ b/drivers/gpu/drm/nouveau/Kconfig > > @@ -46,6 +46,14 @@ config NOUVEAU_DEBUG > > The paranoia and spam levels will add a lot of extra checks which > > may potentially slow down driver operation. > > > > +config DRM_NOUVEAU_LED > > + bool "Support for logo LED" > > + depends on DRM_NOUVEAU && LEDS_CLASS > > + depends on !(DRM_NOUVEAU=y && LEDS_CLASS=m) > > + help > > + Say Y here to enabling controlling the brightness of the > >...

...te: > The newly introduced LED handling for nouveau fails to link when the > driver is built-in but the LED subsystem is a loadable module: > > drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_do_suspend': > tvnv17.c:(.text.nouveau_do_suspend+0x10): undefined reference to `nouveau_led_suspend' > drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_do_resume': > tvnv17.c:(.text.nouveau_do_resume+0xf0): undefined reference to `nouveau_led_resume' > drivers/gpu/drm/nouveau/nouveau.o: In function `nouveau_drm_unload': > tvnv17.c:(.text.nouveau_drm_unlo...

If CONFIG_DRM_NOUVEAU=y and CONFIG_LEDS_CLASS=m, then nouveau_led.o is neither stubbed out nor compiled in and the compile fails with undefined symbols in nouveau_drm.c. I'm guessing it's commit 8d021d71b324. (Thanks for the cool hack, BTW, even if I don't have such a card and am complaining about the patch.) Worked around by setting CONFIG_NEW_LED...