Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp3867678pxy; Mon, 26 Apr 2021 11:39:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJkkEt5qOG0UyXL/B3usqdnbLLd6Z2h6DsGhG/Y+tsHD/PHKcKOAlq6d1FG5wDQblXydYV X-Received: by 2002:a17:906:2509:: with SMTP id i9mr19925025ejb.117.1619462352432; Mon, 26 Apr 2021 11:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619462352; cv=none; d=google.com; s=arc-20160816; b=Y3scY8louE4dRo6d2YGJPZ57s8pQ36ji26TliOcQQi/uz5MStQAEoYky99jWf6iCwB 06VH1q5YjoNHeuotGTMtx8w920F45HzoSuOh5oZUueudmcZwynO7I71MvfpYrvTQRNrb MwIIFhljQZLaoW+LOSqziMKvp6E8CXtvahTG49dX/Cwo2ta1QHdoC5swCxpwV0cXyASH QuavSry5nt3x0NZMOvz6fAkXnyNpTCVE0YuHiv3SbXAYnIqJ66Cxbgp44IIjD+1eXgMx +wfXK0Q0IsjesRcBvQqgry31CxJpCPhgPUVQL8rDA/Fic01dsOm0db964JmRuModShD+ Mvsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=yIQ8r/6+4jmPXMKwK9VLxpJ4dQsyz8jNXuoO7X+Mvyw=; b=p5WCDtCHXqBuBmNLqur9vI95SldbPNTCtuedAo5G9XwixMx2nqfTEEXcFAQkVScfHg eKzCqIDCG2wlPBXkPhPNrqiAn3PHjPGWOfSmDDdt4mkwBHY5h0d+DoR6dTmnIbnriHJe 7A7ivokojlxF+sh6Mjag+wtnBwmSw4Wx2zgn6kbYef7L3qwarZ/Ja7A1DqQZ55knKVgI HYhbskfDb2J4ANsNsH8aBuSWOQj4bU5dY9wF098m8LV3Ncb+re/LKYNvMu/yPzd1CYLW MRSQK6Hkxna4FdduFwtCi6TiSit7sLF7hbzksAIvkPm7zXIU6nzFLw+W1pKlwyUYf3R4 yRzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=Pia2gB4X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h93si474253edd.584.2021.04.26.11.38.48; Mon, 26 Apr 2021 11:39:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=Pia2gB4X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234752AbhDZSgS (ORCPT + 99 others); Mon, 26 Apr 2021 14:36:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234489AbhDZSgS (ORCPT ); Mon, 26 Apr 2021 14:36:18 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14099C061574 for ; Mon, 26 Apr 2021 11:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=yIQ8r/6+4jmPXMKwK9VLxpJ4dQsyz8jNXuoO7X+Mvyw=; b=Pia2gB4XK5q4kSTSGciQOucVHK v0ER2haHAO4Xtzlhyg9C3ZyyHhT+32Vr15SkVVjrFpmRy/iudnoEbULsFkJQG4ItMQd01cqjTv1eS vjlJrB5SKu7kOsbpSPzY2+qE8S5OVt0Lx1OU86bBlfxUz0XM0/DpXO6IdTrAuxuQukv+5wKMOVwBm Y5s1RX+iRho1HbWUEHsgkrcN+vwOAJx8kPw1AComAWoWEdNL3Fz4Ym37ylA+hROpAKmbrKdMtQ11e wX823W6KgsHCjgm+GCnm3+sHWQBAx0LOmDa/vyGeZrPWqWzjAI6vSujf533OCl/RKecnTUuwsSC/0 qFQKz98w==; Received: from [2601:1c0:6280:3f0::df68] (helo=casper.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lb64q-005xso-6v; Mon, 26 Apr 2021 18:35:31 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula , Damien Lespiau , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm: i915: fix build when ACPI is disabled and BACKLIGHT=m Date: Mon, 26 Apr 2021 11:35:16 -0700 Message-Id: <20210426183516.18957-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_DRM_I915=y, CONFIG_ACPI is not set, and CONFIG_BACKLIGHT_CLASS_DEVICE=m, not due to I915 config, there are build errors trying to reference backlight_device_{un}register(). Changing the use of IS_ENABLED() to IS_REACHABLE() in intel_panel.[ch] fixes this. ld: drivers/gpu/drm/i915/display/intel_panel.o: in function `intel_backlight_device_register': intel_panel.c:(.text+0x2ec1): undefined reference to `backlight_device_register' ld: drivers/gpu/drm/i915/display/intel_panel.o: in function `intel_backlight_device_unregister': intel_panel.c:(.text+0x2f93): undefined reference to `backlight_device_unregister' ld: drivers/gpu/drm/i915/display/intel_panel.o: in function `intel_backlight_device_register': intel_panel.c:(.text+0x2ec1): undefined reference to `backlight_device_register' ld: drivers/gpu/drm/i915/display/intel_panel.o: in function `intel_backlight_device_unregister': intel_panel.c:(.text+0x2f93): undefined reference to `backlight_device_unregister' Fixes: 912e8b12eedb ("drm/i915: register backlight device also when backlight class is a module") Fixes: 44c1220a441c ("drm/i915: extract intel_panel.h from intel_drv.h") Signed-off-by: Randy Dunlap Cc: Ville Syrjälä Cc: Jani Nikula Cc: Damien Lespiau Cc: Daniel Vetter Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org --- Found in linux-next but applies to mainline (5.12). drivers/gpu/drm/i915/display/intel_panel.c | 2 +- drivers/gpu/drm/i915/display/intel_panel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-next-20210426.orig/drivers/gpu/drm/i915/display/intel_panel.c +++ linux-next-20210426/drivers/gpu/drm/i915/display/intel_panel.c @@ -1254,7 +1254,7 @@ void intel_panel_enable_backlight(const mutex_unlock(&dev_priv->backlight_lock); } -#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) +#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE) static u32 intel_panel_get_backlight(struct intel_connector *connector) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); --- linux-next-20210426.orig/drivers/gpu/drm/i915/display/intel_panel.h +++ linux-next-20210426/drivers/gpu/drm/i915/display/intel_panel.h @@ -54,7 +54,7 @@ u32 intel_panel_invert_pwm_level(struct u32 intel_panel_backlight_level_to_pwm(struct intel_connector *connector, u32 level); u32 intel_panel_backlight_level_from_pwm(struct intel_connector *connector, u32 val); -#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) +#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE) int intel_backlight_device_register(struct intel_connector *connector); void intel_backlight_device_unregister(struct intel_connector *connector); #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */