From: Karol Herbst <kherbst@redhat.com>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
David Airlie <airlied@linux.ie>,
nouveau <nouveau@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Nikola Cornij <nikola.cornij@amd.com>,
Ben Skeggs <bskeggs@redhat.com>, Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [Nouveau] [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n
Date: Fri, 23 Jul 2021 17:15:43 +0200 [thread overview]
Message-ID: <CACO55tvQoCnjQWRJhrJ+8TzY5MuDDSUSnwd5AU8G1qsQYCSCBg@mail.gmail.com> (raw)
In-Reply-To: <a618e29a-e4b7-bda4-a3e0-7dfd67d64e92@infradead.org>
On Fri, Jul 23, 2021 at 5:10 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 7/23/21 2:15 AM, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > 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.
> >
> > Fixes: 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > index 093e1f7163b3..fcf53e24db21 100644
> > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > @@ -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);
> >
>
> Hm, only Lyude Paul replied to this patch:
>
> https://lore.kernel.org/lkml/20210714171523.413-1-rdunlap@infradead.org/
>
what's actually the use case of compiling with
CONFIG_DRM_NOUVEAU_BACKLIGHT=n anyway?
>
>
> --
> ~Randy
>
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
next prev parent reply other threads:[~2021-07-23 15:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 9:15 [Nouveau] [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n Arnd Bergmann
2021-07-23 9:24 ` Daniel Vetter
2021-07-23 10:10 ` Karol Herbst
2021-07-23 10:12 ` Karol Herbst
2021-07-23 10:16 ` Arnd Bergmann
2021-07-23 15:23 ` Daniel Vetter
2021-07-23 19:14 ` Cornij, Nikola
2021-07-23 19:54 ` Harry Wentland
2021-07-23 16:12 ` Lyude Paul
2021-07-23 15:10 ` Randy Dunlap
2021-07-23 15:15 ` Karol Herbst [this message]
2021-07-23 16:31 ` Randy Dunlap
2021-07-23 16:34 ` Karol Herbst
2021-07-23 18:40 ` Arnd Bergmann
2021-07-23 18:48 ` Karol Herbst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACO55tvQoCnjQWRJhrJ+8TzY5MuDDSUSnwd5AU8G1qsQYCSCBg@mail.gmail.com \
--to=kherbst@redhat.com \
--cc=airlied@linux.ie \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=bskeggs@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nikola.cornij@amd.com \
--cc=nouveau@lists.freedesktop.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).