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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25894C32796 for ; Wed, 24 Aug 2022 17:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238242AbiHXRlb (ORCPT ); Wed, 24 Aug 2022 13:41:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239442AbiHXRla (ORCPT ); Wed, 24 Aug 2022 13:41:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AA817EFF0 for ; Wed, 24 Aug 2022 10:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661362888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QQYWm+a+dWbY84ofHv5p7ZkgFL1UHTJco9y7zH1BEdE=; b=ZEIbbYB9H8Rkja5bOmXCBOFryTt9aMwmNBxPUt5NePKnCGP8NZJAqjZKvhY3zRRLTkw+kR BNM7I4BIRHCT+x1dy7QwDCLYk1QR/hTEbAvsIuBJbqZmAFf4EfZwdsjBfYvvDvwovH7nW2 MwBOfE+8IS4N3I+VQ9ZsMVkPoPJRgF8= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-422-vFVERFhpOEOCohpwfXEYVg-1; Wed, 24 Aug 2022 13:41:27 -0400 X-MC-Unique: vFVERFhpOEOCohpwfXEYVg-1 Received: by mail-qv1-f70.google.com with SMTP id db3-20020a056214170300b00496c0aabfc9so9247488qvb.16 for ; Wed, 24 Aug 2022 10:41:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:organization :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc; bh=QQYWm+a+dWbY84ofHv5p7ZkgFL1UHTJco9y7zH1BEdE=; b=ZSWUpsVO078FW5EYU4gBL5JR7TwNfhg5baYdMeBDyWJIz3CicimZ/384n1pPUi0G0d /s/07aLqdY5K70qugQiPz967iEjABwlFxFGv3e7p1AngHdUl6HiF5vNJK05ubpJ5nqNf HJSJn7/qc9Zw2gbXBzqG38QPwoAUbWJrjj37AMvP7iaf7u8qPqWpja18N4nvwB8rAPpY rOrzO/Z96TCOfJ5KF4aGZxcCrujL+iyGlHERV2ty6UhZTeL1grPzzxNVDgeLNgoB/dcx qaf5RkZGCyJGLyjUuZcTGWNtAahDJg24wjnBlS96OzUv4NsJh0wjmoJ0tH3ikq/A9iho cjjQ== X-Gm-Message-State: ACgBeo0ldSyySLqJJxqteBsAd0zYn8EuM36uCMz946E1nEHmcYdno/U7 4B7NzfTwEatC5qTke6Xwi3z04GJzVQg5jwZbu2zKe/KFvrrNcYA2EltPWGtRLxxbP9+g/C1CSLr ruK5WS7f4CBFIDH5CSNTBElzRERT718Sm3A== X-Received: by 2002:a05:620a:2a0a:b0:6bb:d296:3196 with SMTP id o10-20020a05620a2a0a00b006bbd2963196mr241426qkp.785.1661362885615; Wed, 24 Aug 2022 10:41:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR4k9upIjIL6VhJVoX42w7PZHf4ZeB0YlayxyCpkfOZfncucIivKxnpawGDLxvj+codgniVL0w== X-Received: by 2002:a05:620a:2a0a:b0:6bb:d296:3196 with SMTP id o10-20020a05620a2a0a00b006bbd2963196mr241398qkp.785.1661362885362; Wed, 24 Aug 2022 10:41:25 -0700 (PDT) Received: from [192.168.8.139] (pool-100-0-245-4.bstnma.fios.verizon.net. [100.0.245.4]) by smtp.gmail.com with ESMTPSA id bm30-20020a05620a199e00b006bb11f9a859sm15477427qkb.122.2022.08.24.10.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 10:41:24 -0700 (PDT) Message-ID: <1463d0d38e97e5664dbc0b67a7a5620bb198bcce.camel@redhat.com> Subject: Re: [PATCH v4 05/31] drm/nouveau: Don't register backlight when another backlight should be used (v2) From: Lyude Paul To: Hans de Goede , Ben Skeggs , Karol Herbst , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , Christian =?ISO-8859-1?Q?K=F6nig?= , Pan Xinhui , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko Cc: nouveau@lists.freedesktop.org, Daniel Vetter , David Airlie , intel-gfx , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Len Brown , linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org Date: Wed, 24 Aug 2022 13:41:22 -0400 In-Reply-To: <20220824121523.1291269-6-hdegoede@redhat.com> References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-6-hdegoede@redhat.com> Organization: Red Hat Inc. Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Just one tiny nitpick below: On Wed, 2022-08-24 at 14:14 +0200, Hans de Goede wrote: > Before this commit when we want userspace to use the acpi_video backlight > device we register both the GPU's native backlight device and acpi_video's > firmware acpi_video# backlight device. This relies on userspace preferring > firmware type backlight devices over native ones. > > Registering 2 backlight devices for a single display really is > undesirable, don't register the GPU's native backlight device when > another backlight device should be used. > > Changes in v2: > - Add nouveau_acpi_video_backlight_use_native() wrapper to avoid unresolved > symbol errors on non X86 > > Signed-off-by: Hans de Goede > --- > drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 +++++ > drivers/gpu/drm/nouveau/nouveau_acpi.h | 2 ++ > drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 ++++++ > 3 files changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c > index 6140db756d06..1592c9cd7750 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c > +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c > @@ -386,3 +386,8 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) > > return kmemdup(edid, EDID_LENGTH, GFP_KERNEL); > } > + > +bool nouveau_acpi_video_backlight_use_native(void) > +{ > + return acpi_video_backlight_use_native(); > +} > diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.h b/drivers/gpu/drm/nouveau/nouveau_acpi.h > index 330f9b837066..3c666c30dfca 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_acpi.h > +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.h > @@ -11,6 +11,7 @@ void nouveau_register_dsm_handler(void); > void nouveau_unregister_dsm_handler(void); > void nouveau_switcheroo_optimus_dsm(void); > void *nouveau_acpi_edid(struct drm_device *, struct drm_connector *); > +bool nouveau_acpi_video_backlight_use_native(void); > #else > static inline bool nouveau_is_optimus(void) { return false; }; > static inline bool nouveau_is_v1_dsm(void) { return false; }; > @@ -18,6 +19,7 @@ static inline void nouveau_register_dsm_handler(void) {} > static inline void nouveau_unregister_dsm_handler(void) {} > static inline void nouveau_switcheroo_optimus_dsm(void) {} > static inline void *nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return NULL; } > +static inline bool nouveau_acpi_video_backlight_use_native(void) { return true; } > #endif > > #endif > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c > index a2141d3d9b1d..d2b8f8c13db4 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c > +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c > @@ -38,6 +38,7 @@ > #include "nouveau_reg.h" > #include "nouveau_encoder.h" > #include "nouveau_connector.h" > +#include "nouveau_acpi.h" > > static struct ida bl_ida; > #define BL_NAME_SIZE 15 // 12 for name + 2 for digits + 1 for '\0' > @@ -405,6 +406,11 @@ nouveau_backlight_init(struct drm_connector *connector) > goto fail_alloc; > } > > + if (!nouveau_acpi_video_backlight_use_native()) { > + NV_INFO(drm, "Skipping nv_backlight registration\n"); > + goto fail_alloc; > + } We should probably make this say something like "No native backlight interface, using ACPI instead" instead. With that fixed Reviewed-by: Lyude Paul > + > if (!nouveau_get_backlight_name(backlight_name, bl)) { > NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n"); > goto fail_alloc; -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat