From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EEF6C4338F for ; Fri, 23 Jul 2021 15:10:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D45BA60E75 for ; Fri, 23 Jul 2021 15:10:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D45BA60E75 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96C9F6F542; Fri, 23 Jul 2021 15:10:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03A226F542; Fri, 23 Jul 2021 15:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=LKJwoEO1wUjFT3s3QZ/zN1joVg7QWbIkky8FZ44RfLM=; b=b5yuGhnUGqE3wcNbUCVCmHGuVX 7TwLHqU1RIq2EPTAq3uOeTLmasrdnPvpU3DMWAWPRb84t8iyh9LfbrkqaysSlMa1VAV6De4sgZEKG 610EFEeGLOdndk47bwOvWoG1WFjA7IqQejMl0qdc3KvB6sfy8+6ojkPRxKKqCQbq3CAZVjd/B1TGb b7h/+cBIzwa5D5p6PPbOAm+rhTl3pZlffKJuK2aFGJXKVU57L+UfKNIPC9hdk417uGLQBdDGRytxP BED+LkZWKYohwwsV613SON0x1WC9HdXpmcn523QY8LKsnl5gFVciCQZzcjHUPlfyKGjkDBu8PL/pe WeMjksZA==; Received: from [2601:1c0:6280:3f0::aefb] by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6wp3-0056np-Kx; Fri, 23 Jul 2021 15:10:45 +0000 To: Arnd Bergmann , Ben Skeggs , David Airlie , Daniel Vetter , Lyude Paul References: <20210723091534.1730564-1-arnd@kernel.org> From: Randy Dunlap Message-ID: Date: Fri, 23 Jul 2021 08:10:43 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210723091534.1730564-1-arnd@kernel.org> Content-Language: en-US Subject: Re: [Nouveau] [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Nikola Cornij , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" On 7/23/21 2:15 AM, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 > --- > 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/ -- ~Randy _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24823C432BE for ; Fri, 23 Jul 2021 15:10:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3BDE60EE2 for ; Fri, 23 Jul 2021 15:10:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E3BDE60EE2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E0AD26FB86; Fri, 23 Jul 2021 15:10:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03A226F542; Fri, 23 Jul 2021 15:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=LKJwoEO1wUjFT3s3QZ/zN1joVg7QWbIkky8FZ44RfLM=; b=b5yuGhnUGqE3wcNbUCVCmHGuVX 7TwLHqU1RIq2EPTAq3uOeTLmasrdnPvpU3DMWAWPRb84t8iyh9LfbrkqaysSlMa1VAV6De4sgZEKG 610EFEeGLOdndk47bwOvWoG1WFjA7IqQejMl0qdc3KvB6sfy8+6ojkPRxKKqCQbq3CAZVjd/B1TGb b7h/+cBIzwa5D5p6PPbOAm+rhTl3pZlffKJuK2aFGJXKVU57L+UfKNIPC9hdk417uGLQBdDGRytxP BED+LkZWKYohwwsV613SON0x1WC9HdXpmcn523QY8LKsnl5gFVciCQZzcjHUPlfyKGjkDBu8PL/pe WeMjksZA==; Received: from [2601:1c0:6280:3f0::aefb] by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6wp3-0056np-Kx; Fri, 23 Jul 2021 15:10:45 +0000 Subject: Re: [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n To: Arnd Bergmann , Ben Skeggs , David Airlie , Daniel Vetter , Lyude Paul References: <20210723091534.1730564-1-arnd@kernel.org> From: Randy Dunlap Message-ID: Date: Fri, 23 Jul 2021 08:10:43 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210723091534.1730564-1-arnd@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Nikola Cornij Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 7/23/21 2:15 AM, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 > --- > 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/ -- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8825FC4338F for ; Fri, 23 Jul 2021 15:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6962960EFD for ; Fri, 23 Jul 2021 15:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235495AbhGWOaQ (ORCPT ); Fri, 23 Jul 2021 10:30:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235438AbhGWOaO (ORCPT ); Fri, 23 Jul 2021 10:30:14 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07483C061575 for ; Fri, 23 Jul 2021 08:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=LKJwoEO1wUjFT3s3QZ/zN1joVg7QWbIkky8FZ44RfLM=; b=b5yuGhnUGqE3wcNbUCVCmHGuVX 7TwLHqU1RIq2EPTAq3uOeTLmasrdnPvpU3DMWAWPRb84t8iyh9LfbrkqaysSlMa1VAV6De4sgZEKG 610EFEeGLOdndk47bwOvWoG1WFjA7IqQejMl0qdc3KvB6sfy8+6ojkPRxKKqCQbq3CAZVjd/B1TGb b7h/+cBIzwa5D5p6PPbOAm+rhTl3pZlffKJuK2aFGJXKVU57L+UfKNIPC9hdk417uGLQBdDGRytxP BED+LkZWKYohwwsV613SON0x1WC9HdXpmcn523QY8LKsnl5gFVciCQZzcjHUPlfyKGjkDBu8PL/pe WeMjksZA==; Received: from [2601:1c0:6280:3f0::aefb] by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6wp3-0056np-Kx; Fri, 23 Jul 2021 15:10:45 +0000 Subject: Re: [PATCH] drm/nouveau/kms/nv50-: fix build failure with CONFIG_BACKLIGHT=n To: Arnd Bergmann , Ben Skeggs , David Airlie , Daniel Vetter , Lyude Paul Cc: Arnd Bergmann , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= , Nikola Cornij , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20210723091534.1730564-1-arnd@kernel.org> From: Randy Dunlap Message-ID: Date: Fri, 23 Jul 2021 08:10:43 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210723091534.1730564-1-arnd@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/23/21 2:15 AM, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 > --- > 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/ -- ~Randy