drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n
Subsystems (3)
PATCH 1/1 drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'struct nouveau_connector' has no member named 'backlight'
1665 | struct nouveau_backlight *backlight = nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'struct nouveau_backlight'
1670 | if (backlight && backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'struct nouveau_backlight'
1671 | ret = drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +7 -4
@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT +struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev); +struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);
Signature · 1 line
2.29.2
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~
Quoted 5 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>
Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Quoted 39 lines
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +7
-5@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT +struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev); +struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); --2.29.2
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 28 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 5 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 6 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
same, I'd just require BACKLIGHT as well tbh.
Quoted 46 lines
Quoted 37 lines
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +7
-5@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT +struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev); +struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); --Quoted 2 lines
2.29.2
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 30 lines · Karol Herbst
Quoted 28 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 5 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 9 lines
Quoted 6 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
same, I'd just require BACKLIGHT as well tbh.
ehhh, get rid of DRM_NOUVEAU_BACKLIGHT I meant.
Quoted 46 lines
Quoted 46 lines
Quoted 37 lines
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +7
-5@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT +struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev); +struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); --Quoted 2 lines
2.29.2
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 28 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 5 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 5 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Yes! I'd definitely be in favor of that, I've wasted way too much time trying to sort through dependency loops and other problems with backlight support.
Maybe we should leave the drivers/video/fbdev/ drivers untouched in this regard, at least for the moment, but for the drivers/gpu/drm users of backlight that would be a nice simplification, and even the smallest ones are unlikely to be used on systems that are too memory constrained to deal with 4KB extra .text.
Arnd
Quoted 35 lines · Arnd Bergmann
Quoted 28 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 5 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 5 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Quoted 8 lines
Yes! I'd definitely be in favor of that, I've wasted way too much time trying to sort through dependency loops and other problems with backlight support.
Maybe we should leave the
drivers/video/fbdev/drivers untouched in this regard, at least for the moment, but for thedrivers/gpu/drmusers of backlight that would be a nice simplification, and even the smallest ones are unlikely to be used on systems that are too memory constrained to deal with 4KB extra .text.
Yeah I think we can do this entirely ad-hoc, i.e. any time the backlight wheel wobbles off again we nail it down for good for that driver with a depends on BACKGLIGHT and remove any lingering #ifdef all over.
If you want maybe start out with the biggest drm drivers in a series, I think if nouveau/amdgpu/i915 folks ack this you're good to go to just convert as things get in the way.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
[AMD Official Use Only]
+Harry
-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Friday, July 23, 2021 11:23 AM
To: Arnd Bergmann <[email protected]>
Cc: Daniel Vetter <[email protected]>; Ben Skeggs <[email protected]>; David Airlie <[email protected]>; Lyude Paul <[email protected]>; Arnd Bergmann <[email protected]>; Ville Syrjälä <[email protected]>; Cornij, Nikola <[email protected]>; dri-devel <[email protected]>; Nouveau Dev <[email protected]>; Linux Kernel Mailing List <[email protected]>
Subject: Re: [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n
Quoted 36 lines · Arnd Bergmann
Quoted 29 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 6 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCDbacklight support for nouveau")
Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 5 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Quoted 8 lines
Yes! I'd definitely be in favor of that, I've wasted way too much time trying to sort through dependency loops and other problems with backlight support.
Maybe we should leave the
drivers/video/fbdev/drivers untouched in this regard, at least for the moment, but for thedrivers/gpu/drmusers of backlight that would be a nice simplification, and even the smallest ones are unlikely to be used on systems that are too memory constrained to deal with 4KB extra .text.
Yeah I think we can do this entirely ad-hoc, i.e. any time the backlight wheel wobbles off again we nail it down for good for that driver with a depends on BACKGLIGHT and remove any lingering #ifdef all over.
If you want maybe start out with the biggest drm drivers in a series, I think if nouveau/amdgpu/i915 folks ack this you're good to go to just convert as things get in the way. -Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fblog.ffwll.ch%2F&data=04%7C01%7Cnikola.cornij%40amd.com%7C48104ef3c5724531e8f708d94dedcf83%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637626506075627495%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=KWVzpQyZsBh4jo522b36pru1zPBxxW2wvXUAjJ6u3G8%3D&reserved=0
Quoted 57 lines · Nikola
[AMD Official Use Only]
+Harry
-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Friday, July 23, 2021 11:23 AM
To: Arnd Bergmann <[email protected]>
Cc: Daniel Vetter <[email protected]>; Ben Skeggs <[email protected]>; David Airlie <[email protected]>; Lyude Paul <[email protected]>; Arnd Bergmann <[email protected]>; Ville Syrjälä <[email protected]>; Cornij, Nikola <[email protected]>; dri-devel <[email protected]>; Nouveau Dev <[email protected]>; Linux Kernel Mailing List <[email protected]>
Subject: Re: [PATCH] drm/nouveau/kms/nv50-: fix build failure withCONFIG_BACKLIGHT=nQuoted 36 lines · Arnd Bergmann
Quoted 29 lines · Daniel Vetter
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~Quoted 6 lines
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCDbacklight support for nouveau")
Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Quoted 5 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Quoted 8 lines
Yes! I'd definitely be in favor of that, I've wasted way too much time trying to sort through dependency loops and other problems with backlight support.
Maybe we should leave the
drivers/video/fbdev/drivers untouched in this regard, at least for the moment, but for thedrivers/gpu/drmusers of backlight that would be a nice simplification, and even the smallest ones are unlikely to be used on systems that are too memory constrained to deal with 4KB extra .text.
Quoted 3 lines
Yeah I think we can do this entirely ad-hoc, i.e. any time the backlight wheel wobbles off again we nail it down for good for that driver with a depends on BACKGLIGHT and remove any lingering #ifdef all over.
If you want maybe start out with the biggest drm drivers in a series, I think if nouveau/amdgpu/i915 folks ack this you're good to go to just convert as things get in the way.
Sounds like a good idea to me.
Harry
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch/>>
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
Lyude Paul
maintainerQuoted 26 lines · Daniel Vetter
Quoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight = nv_connector-Quoted 1 line
backlight;
| ^~
drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret = drm_edp_backlight_disable(aux, &backlight-Quoted 1 line
edp_info);| ^~
The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Quoted 7 lines
Quoted 3 lines
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlightsupport for nouveau")
Signed-off-by Arnd Bergmann <[email protected]>Can we just toss the idea that BACKTLIGHT=n is a reasonable config for drm drivers using backlights, and add depends BACKLIGHT to all of them?
Yeah - I'm fine with this IMHO, at least for the drivers actually supporting backlights in some manner (I assume this is most of them though)
Quoted 55 lines
I mean this is a perfect source of continued patch streams to keep us all busy, but beyond that I really don't see the point ... I frankly have better things to do, and especially with the big drivers we have making backlight optional saves comparitively nothing. -Daniel
Quoted 46 lines
---
drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++----1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +0
-0@@ -1659,20 +1659,23 @@ static voidnv50_sor_atomic_disable(struct
drm_encoder*encoder, structdrm_atomic_state*state)
{
structnouveau_encoder*nv_encoder=nouveau_encoder(encoder); - structnouveau_drm*drm =nouveau_drm(nv_encoder->base.base.dev); structnouveau_crtc*nv_crtc=nouveau_crtc(nv_encoder->crtc); structnouveau_connector*nv_connector=nv50_outp_get_old_connector(state, nv_encoder);
- structnouveau_backlight*backlight =nv_connector->backlight; structdrm_dp_aux*aux =&nv_connector->aux;
- int ret;
u8 pwr;drivers/gpu/drm/nouveau/dispnv50/disp.c +4
-0+#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT + struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); + struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight &&
backlight->uses_dpcd) {
- ret = drm_edp_backlight_disable(aux, &backlight-Quoted 1 line
edp_info);+ int ret = drm_edp_backlight_disable(aux, &backlight-
Quoted 1 line
edp_info);+
if (ret < 0)
NV_ERROR(drm, "Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n",
nv_connector->base.base.id, nv_connector-Quoted 1 line
base.name, ret);
}
+#endifif (
nv_encoder->dcb->type==DCB_OUTPUT_DP) {
int ret =drm_dp_dpcd_readb(aux, DP_SET_POWER, &pwr); --
2.29.2
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Quoted 47 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +4
-4@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT + struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); + struct nouveau_backlight *backlight = nv_connector->backlight; + if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info);
drivers/gpu/drm/nouveau/dispnv50/disp.c static void · line 1681
Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3
-0+int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);
Hm, only Lyude Paul replied to this patch:
https://lore.kernel.org/lkml/[email protected]/
Signature · 6 lines
~Randy _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
Quoted 56 lines · Randy Dunlap
Quoted 54 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +7
-4@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT +struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev); +struct nouveau_backlight *backlight = nv_connector->backlight; +if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif
Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c static void · line 1681
Quoted 3 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0
-0if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);Hm, only Lyude Paul replied to this patch:
what's actually the use case of compiling withCONFIG_DRM_NOUVEAU_BACKLIGHT=n anyway?
Quoted 5 lines
--
~Randy
Quoted 63 lines · Karol Herbst
Quoted 62 lines · Randy Dunlap
Quoted 47 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +4
-4@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT + struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); + struct nouveau_backlight *backlight = nv_connector->backlight; + if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info);drivers/gpu/drm/nouveau/dispnv50/disp.c static void · line 1681
Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3
-0+int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);Hm, only Lyude Paul replied to this patch:
Quoted 5 lines
Quoted 2 lines
what's actually the use case of compiling with
CONFIG_DRM_NOUVEAU_BACKLIGHT=nanyway?
Dunno. In this case it was just a randconfig. Still, it needs to be handled in some way - such as the other suggestion in this thread.
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
Quoted 65 lines · Randy Dunlap
Quoted 63 lines · Karol Herbst
Quoted 62 lines · Randy Dunlap
Quoted 47 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When the backlight support is disabled, the driver fails to build:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1665:59: error: 'structnouveau_connector' has no member named 'backlight'
1665 | structnouveau_backlight*backlight =nv_connector->backlight;
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1670:35: error: invalid use of undefined type 'structnouveau_backlight'
1670 | if (backlight &&backlight->uses_dpcd) {
| ^~drivers/gpu/drm/nouveau/dispnv50/disp.c:1671:64: error: invalid use of undefined type 'structnouveau_backlight'
1671 | ret =drm_edp_backlight_disable(aux, &backlight->edp_info);
| ^~The patch that introduced the problem already contains some #ifdef checks, so just add another one that makes it build again.
Fixes 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +4
-4@@ -1659,20 +1659,23 @@ static void nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_drm *drm =nouveau_drm (nv_encoder->base.base.dev);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder); -struct nouveau_backlight *backlight = nv_connector->backlight;struct drm_dp_aux *aux = &nv_connector->aux; -int ret;u8 pwr; +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT + struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); + struct nouveau_backlight *backlight = nv_connector->backlight; + if (backlight && backlight->uses_dpcd) { - ret =drm_edp_backlight_disable (aux, &backlight->edp_info);drivers/gpu/drm/nouveau/dispnv50/disp.c static void · line 1681
Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3
-0+int ret =drm_edp_backlight_disable (aux, &backlight->edp_info); +if (ret <0 )NV_ERROR (drm,"Failed to disable backlight on [CONNECTOR:%d:%s]: %d\n" , nv_connector->base.base.id, nv_connector->base.name, ret); } +#endif if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);Hm, only Lyude Paul replied to this patch:
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
what's actually the use case of compiling with
CONFIG_DRM_NOUVEAU_BACKLIGHT=nanyway?Dunno. In this case it was just a randconfig. Still, it needs to be handled in some way - such as the other suggestion in this thread.
sure, I was just curious if there was a specific use case or just something random as you mentioned.
Quoted 7 lines · Karol Herbst
Quoted 6 lines · Randy Dunlap
Quoted 4 lines · Karol Herbst
On Fri, Jul 23, 2021 at 5:10 PM Randy Dunlap <[email protected]> wrote:
what's actually the use case of compiling with
CONFIG_DRM_NOUVEAU_BACKLIGHT=nanyway?
Quoted 6 lines
Quoted 3 lines
Dunno. In this case it was just a randconfig. Still, it needs to be handled in some way - such as the other suggestion in this thread.
sure, I was just curious if there was a specific use case or just something random as you mentioned.
I think this is purely done because of tradition. A long time ago, we had tiny framebuffer drivers and most PCs did not have backlights, so it made sense to leave this optional.
This was probably just always carried over.
Arnd
Quoted 16 lines · Arnd Bergmann
Quoted 7 lines · Karol Herbst
Quoted 6 lines · Randy Dunlap
Quoted 4 lines · Karol Herbst
On Fri, Jul 23, 2021 at 5:10 PM Randy Dunlap <[email protected]> wrote:
what's actually the use case of compiling with
CONFIG_DRM_NOUVEAU_BACKLIGHT=nanyway?Quoted 6 lines
Quoted 3 lines
Dunno. In this case it was just a randconfig. Still, it needs to be handled in some way - such as the other suggestion in this thread.
sure, I was just curious if there was a specific use case or just something random as you mentioned.
Quoted 8 lines
I think this is purely done because of tradition. A long time ago, we had tiny framebuffer drivers and most PCs did not have backlights, so it made sense to leave this optional.
This was probably just always carried over.
Arnd
okay. I think I will write a patch for nouveau then and send it out soonish
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau