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 8A525C04AA5 for ; Thu, 25 Aug 2022 08:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230483AbiHYIyr (ORCPT ); Thu, 25 Aug 2022 04:54:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbiHYIyr (ORCPT ); Thu, 25 Aug 2022 04:54:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E30A3A8324 for ; Thu, 25 Aug 2022 01:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661417683; 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=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=TaOa77YLZDfBfpuihQq8CiDmPRWxz+sVpRkh2qaIMNPLLiq+V+96gks+j5bj0pB1n2ZN3m ergO8BAVzammaXWR22mqDdK7kCfOuFf0K7Rfy6HuZzE0J3KxTfDupym3AglDETi9GXKnbq nqGIJzs1l1FB5pzZ7jLdlrFxUCi84uI= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-231-4hxB21RsPzK1gOuLdGTbUQ-1; Thu, 25 Aug 2022 04:54:41 -0400 X-MC-Unique: 4hxB21RsPzK1gOuLdGTbUQ-1 Received: by mail-ed1-f69.google.com with SMTP id f18-20020a056402355200b00446c8d2ed50so7039875edd.18 for ; Thu, 25 Aug 2022 01:54:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=ZK+YCQFoFI3/LEES2UnbYt55fWCZkrIC+W8y48LRiJEG6smW1GIXCEtJVqUmV++9KZ dIh+cPXEQ/Bs4t8A7JsAjp6V3c1Y2kYwesLrwSfkfGqmjur4bKKykvvmj7I4OIiE1wwe ScZqVGPt/mnQwsAGzTTeRMoJX7Ao2aTZ6pvlfY1kZsoNb7NvlKCrlNAI3z8UIsZD5wrP zyk7F+FtsnDlKdC/mZxkPa7hqtSdk0KwoRbEf3qm2j3QXxdpl1pkyM8J/a29e41yBLJx /bpOsPScN8nEDsQTdsLuX6GGL4AH++SHFVP1E6npOFfzZ9yY8otxI4QvSpL16OrnDKIh vPcQ== X-Gm-Message-State: ACgBeo34L64dg1VZ7AWiZpa4S70ZiaGdp3kD814vmp7wGZEF2QUckKTo F+viRkNFP4Ij1TpBHTV522xol6qqD3hRwhggx6yCMtSHdqA6wBL2R0O29O56aZ7DG8GAHsGqxjh TZjAIVarwzRqk9owmbWcpgw== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742634ejc.361.1661417679936; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4iRqqUbLSIQozsEoevWSbUBOoNa7wZuPHEqVSEVtqoqW7Rc5PQi4B3ygUaYiDI2xHU+dtygQ== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742616ejc.361.1661417679691; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b0073d74e1a467sm997841ejn.167.2022.08.25.01.54.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Message-ID: <914dec00-65f4-f49c-9ace-39321b88e8b6@redhat.com> Date: Thu, 25 Aug 2022 10:54:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v4 02/31] drm/i915: Don't register backlight when another backlight should be used Content-Language: en-US To: Jani Nikula , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko Cc: nouveau@lists.freedesktop.org, Daniel Vetter , 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 References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-3-hdegoede@redhat.com> <87v8qhiz4f.fsf@intel.com> From: Hans de Goede In-Reply-To: <87v8qhiz4f.fsf@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi All, On 8/24/22 14:50, Jani Nikula wrote: > On Wed, 24 Aug 2022, 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. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_backlight.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c >> index 681ebcda97ad..a4dd7924e0c1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_backlight.c >> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c >> @@ -8,6 +8,8 @@ >> #include >> #include >> >> +#include >> + >> #include "intel_backlight.h" >> #include "intel_backlight_regs.h" >> #include "intel_connector.h" >> @@ -952,6 +954,11 @@ int intel_backlight_device_register(struct intel_connector *connector) >> >> WARN_ON(panel->backlight.max == 0); >> >> + if (!acpi_video_backlight_use_native()) { >> + DRM_INFO("Skipping intel_backlight registration\n"); > > Could use drm_info with drm_device. Ack, fixed for v5. > Either way, > > Reviewed-by: Jani Nikula Thank you. > and ack for merging via whichever tree suits you best. My plan is to create a branch with the series on top of 6.0-rc1 and then send a pull-req to all involved trees. So far there are no conflicts between this branch and drm-tip... Regards, Hans >> + return 0; >> + } >> + >> memset(&props, 0, sizeof(props)); >> props.type = BACKLIGHT_RAW; > 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4BCC2C04AA5 for ; Thu, 25 Aug 2022 08:54:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C785A1124BA; Thu, 25 Aug 2022 08:54:56 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 144CF11B54D for ; Thu, 25 Aug 2022 08:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661417682; 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=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=JScAjQkKZ9yAhCJvk6rjiH8wRGldGnhB7caGUMVDgU0PZfPY8cpul1MDNS5KJA5VmIQ1xT C+BvJVquEMSQmxHq8YqzOQhBmMb9Fvv7NoSK4QYG48jZuuzvz221viiKmjp8ZhRwn0wueu Av9OqQwDgQAu2CRuT/SVgtOvDteJRyE= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-310-VV15GYXjMWOWlSH2PCNpCQ-1; Thu, 25 Aug 2022 04:54:41 -0400 X-MC-Unique: VV15GYXjMWOWlSH2PCNpCQ-1 Received: by mail-ed1-f69.google.com with SMTP id o2-20020a056402438200b0043d552deb2aso12391887edc.0 for ; Thu, 25 Aug 2022 01:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=FvZZsgZp2oASzBCffu92ubbosLL401DFXlHb1tf5oJH0seCthyudKl8h67pQoRB+Y0 1EXMS32O12BuxGIrjZSXEsUpRwLmtIGEUaNLkv2Nt0ywOimYb8ixzy+flQ/1+VoAJYPr mFiZYMyYVhsdOs3D2NWh4QeX6YaPQSkx4682rjY7Fng1LP5gT+oyrYnAaAQtSduSgQM7 iimemWBAQroZAehkq/eqBwQELOM4z0myN84+MsS861xPcHfkiQi7orSfagi0226L9MlF Du64+XChpFYCkZuQNAvKbXU3vJl9mgKBbxEdmxkvQVGOjwdkBi0ISDOJBCd5HBJBpK5K ey8Q== X-Gm-Message-State: ACgBeo3rJ5kDjVgleYIaewNHIAVy1sVyjABUNrE+RtKbeltLU+OB1WVu dnbmZlksUW6bz0qhdcxJujl2eRQHw46SiCZptRqlniQ9EA9OfxW7sKqNqxWdpU3JifisNcFWyNj Lcwqw0nWBAGfYU/nkEo/iamFhDw== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742642ejc.361.1661417679940; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4iRqqUbLSIQozsEoevWSbUBOoNa7wZuPHEqVSEVtqoqW7Rc5PQi4B3ygUaYiDI2xHU+dtygQ== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742616ejc.361.1661417679691; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b0073d74e1a467sm997841ejn.167.2022.08.25.01.54.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Message-ID: <914dec00-65f4-f49c-9ace-39321b88e8b6@redhat.com> Date: Thu, 25 Aug 2022 10:54:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 To: Jani Nikula , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-3-hdegoede@redhat.com> <87v8qhiz4f.fsf@intel.com> From: Hans de Goede In-Reply-To: <87v8qhiz4f.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Nouveau] [PATCH v4 02/31] drm/i915: Don't register backlight when another backlight should be used 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: nouveau@lists.freedesktop.org, intel-gfx , amd-gfx@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Len Brown Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Hi All, On 8/24/22 14:50, Jani Nikula wrote: > On Wed, 24 Aug 2022, 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. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_backlight.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c >> index 681ebcda97ad..a4dd7924e0c1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_backlight.c >> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c >> @@ -8,6 +8,8 @@ >> #include >> #include >> >> +#include >> + >> #include "intel_backlight.h" >> #include "intel_backlight_regs.h" >> #include "intel_connector.h" >> @@ -952,6 +954,11 @@ int intel_backlight_device_register(struct intel_connector *connector) >> >> WARN_ON(panel->backlight.max == 0); >> >> + if (!acpi_video_backlight_use_native()) { >> + DRM_INFO("Skipping intel_backlight registration\n"); > > Could use drm_info with drm_device. Ack, fixed for v5. > Either way, > > Reviewed-by: Jani Nikula Thank you. > and ack for merging via whichever tree suits you best. My plan is to create a branch with the series on top of 6.0-rc1 and then send a pull-req to all involved trees. So far there are no conflicts between this branch and drm-tip... Regards, Hans >> + return 0; >> + } >> + >> memset(&props, 0, sizeof(props)); >> props.type = BACKLIGHT_RAW; > 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3826DC28D13 for ; Thu, 25 Aug 2022 08:55:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4ADA111B54A; Thu, 25 Aug 2022 08:54:58 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13ACB11B54D for ; Thu, 25 Aug 2022 08:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661417684; 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=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=JjG106Rd4syvV61SMdTaGFUnpvDBnlWKn4u/qPh/3QxN0/4s+Gc3BuRyt0GTPncMmjvFUi 6vHKXTNgeBNv8EZzT7OwHXh6I2mnzre4ZeURK2rOPXsw0fEuDTUGOiPY1wH8HBB8Gz/EN/ NWmhPe1W6daQTok8Wvc/gUIh+SJnxeE= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-150-HmJi1B7WNTmSzZXFf23tjA-1; Thu, 25 Aug 2022 04:54:41 -0400 X-MC-Unique: HmJi1B7WNTmSzZXFf23tjA-1 Received: by mail-ej1-f72.google.com with SMTP id qw34-20020a1709066a2200b00730ca5a94bfso5974012ejc.3 for ; Thu, 25 Aug 2022 01:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=uFZxXlSNIOJxEwZFTu89Hij4Q2T0NILXC/X2qwic66rHFnOwC7vpoYOxtkVVc3tEId s2HdYHehrepzuwXtplfTtFJ932UZqmRwe/Drhm3cS6TunGGy6EYF+Bk7q5rvJMf0CsrV IIo6doFSDG+Kud5rd8MulTAHZ+5eWuM0orTRfR59dCWnGIwLZYrtD4h+bmuCEmtkOTqg 2aWm/6B32KJsVCkL8IC3sA2AeZ9RMiu35b5jZv+ZCeOH1GYAr8PEkY5KlwXsLU/DS4fS 7L080+Gaj5si/5VO5VOR3GrnfeEzGmOO0m9pSWcqZ2jOBOAAXCvoD0yvRGKbuescpaH9 0M0w== X-Gm-Message-State: ACgBeo38JfoOYaTEYT6UtuSXLAjafqyABWdUJYAmUPQ/oSwvEJkX9Wee 68k8GAN5/ha6QRMd6ImIHL4dUe7qj89a6iDJ0P5ALH9PwAei0NWL+Cym5VsjYEw59TEgrMtUAnj ApVTTHFIbxwgUDmlB5utkEGjowPZO X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742631ejc.361.1661417679933; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4iRqqUbLSIQozsEoevWSbUBOoNa7wZuPHEqVSEVtqoqW7Rc5PQi4B3ygUaYiDI2xHU+dtygQ== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742616ejc.361.1661417679691; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b0073d74e1a467sm997841ejn.167.2022.08.25.01.54.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Message-ID: <914dec00-65f4-f49c-9ace-39321b88e8b6@redhat.com> Date: Thu, 25 Aug 2022 10:54:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v4 02/31] drm/i915: Don't register backlight when another backlight should be used To: Jani Nikula , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-3-hdegoede@redhat.com> <87v8qhiz4f.fsf@intel.com> From: Hans de Goede In-Reply-To: <87v8qhiz4f.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 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: nouveau@lists.freedesktop.org, intel-gfx , amd-gfx@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, dri-devel@lists.freedesktop.org, Len Brown Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi All, On 8/24/22 14:50, Jani Nikula wrote: > On Wed, 24 Aug 2022, 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. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_backlight.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c >> index 681ebcda97ad..a4dd7924e0c1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_backlight.c >> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c >> @@ -8,6 +8,8 @@ >> #include >> #include >> >> +#include >> + >> #include "intel_backlight.h" >> #include "intel_backlight_regs.h" >> #include "intel_connector.h" >> @@ -952,6 +954,11 @@ int intel_backlight_device_register(struct intel_connector *connector) >> >> WARN_ON(panel->backlight.max == 0); >> >> + if (!acpi_video_backlight_use_native()) { >> + DRM_INFO("Skipping intel_backlight registration\n"); > > Could use drm_info with drm_device. Ack, fixed for v5. > Either way, > > Reviewed-by: Jani Nikula Thank you. > and ack for merging via whichever tree suits you best. My plan is to create a branch with the series on top of 6.0-rc1 and then send a pull-req to all involved trees. So far there are no conflicts between this branch and drm-tip... Regards, Hans >> + return 0; >> + } >> + >> memset(&props, 0, sizeof(props)); >> props.type = BACKLIGHT_RAW; > 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 62EE0C04AA5 for ; Thu, 25 Aug 2022 08:55:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A01A810E5D4; Thu, 25 Aug 2022 08:55:06 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A89A11B553 for ; Thu, 25 Aug 2022 08:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661417687; 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=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=EoEOgGZMtJm+cI1IH0EQY9bWjf5jXU2LbA1YXK1LHAwA86XqfI/3eGh86hD5YQ1iMjfhqO vCyKqf2hJTgE4sMjs9v6ifx3+6akiKwQ9iH/poD6RmNYWIESvgt3Dl0VE6J0c5nAOYN+he biKHb0xjR/lzzM9YtbCx5Nj/yq0gM14= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-347-vX2FVhiGPQ6fto9TR4CU2Q-1; Thu, 25 Aug 2022 04:54:41 -0400 X-MC-Unique: vX2FVhiGPQ6fto9TR4CU2Q-1 Received: by mail-ed1-f72.google.com with SMTP id h17-20020a05640250d100b00446d1825c9fso6886860edb.14 for ; Thu, 25 Aug 2022 01:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=Eik4ZmIo1fDOSOtYNfHGscM5GrmupliFdatasCbqWiKDtAt2T9WBgrdgKzjAokVvBc sYrSxfcOQDoUN2JazReJwrylcL5LiL0gzZwCvI9mRYzoya7YL7Bq459cIrgRrFOiJ9Q6 DsOo1lg9N5DCVXwEpcTLeOFUrSsOTLnMschcNla5nsptrwn/j9xbSD/dZJGlfk5AxBU1 DOe+yFRgMQA8Xc4LlFh+P/IW/8hcaaOb7qdIoOmcx3yhpH50ND82QfVd+nrlMghMN9nP synFa1jkEPLe4YsfJe7bfu2dTRxrtFP7kCAUtL66A8AtSQkXhGnN7ewpVz69za0+gl2K vtcQ== X-Gm-Message-State: ACgBeo3lN+peojkGqJAzj6Olo/fPaiY1M8KwiZyhvx2MVGEs8llu5PsQ EYcK+Fg7uMZqjHPhwa7oxlVwHPUN/OkFtKQz1dr5n3G8xqJNwbHIUPw5yTDiKy4CE7Dnxqw9nEp GKObeKTO0zWWwloOfaDoE/gZQweMT X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742623ejc.361.1661417679928; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4iRqqUbLSIQozsEoevWSbUBOoNa7wZuPHEqVSEVtqoqW7Rc5PQi4B3ygUaYiDI2xHU+dtygQ== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742616ejc.361.1661417679691; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b0073d74e1a467sm997841ejn.167.2022.08.25.01.54.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Message-ID: <914dec00-65f4-f49c-9ace-39321b88e8b6@redhat.com> Date: Thu, 25 Aug 2022 10:54:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 To: Jani Nikula , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-3-hdegoede@redhat.com> <87v8qhiz4f.fsf@intel.com> From: Hans de Goede In-Reply-To: <87v8qhiz4f.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH v4 02/31] drm/i915: Don't register backlight when another backlight should be used X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau@lists.freedesktop.org, intel-gfx , amd-gfx@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Len Brown Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi All, On 8/24/22 14:50, Jani Nikula wrote: > On Wed, 24 Aug 2022, 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. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_backlight.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c >> index 681ebcda97ad..a4dd7924e0c1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_backlight.c >> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c >> @@ -8,6 +8,8 @@ >> #include >> #include >> >> +#include >> + >> #include "intel_backlight.h" >> #include "intel_backlight_regs.h" >> #include "intel_connector.h" >> @@ -952,6 +954,11 @@ int intel_backlight_device_register(struct intel_connector *connector) >> >> WARN_ON(panel->backlight.max == 0); >> >> + if (!acpi_video_backlight_use_native()) { >> + DRM_INFO("Skipping intel_backlight registration\n"); > > Could use drm_info with drm_device. Ack, fixed for v5. > Either way, > > Reviewed-by: Jani Nikula Thank you. > and ack for merging via whichever tree suits you best. My plan is to create a branch with the series on top of 6.0-rc1 and then send a pull-req to all involved trees. So far there are no conflicts between this branch and drm-tip... Regards, Hans >> + return 0; >> + } >> + >> memset(&props, 0, sizeof(props)); >> props.type = BACKLIGHT_RAW; > 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 80E0DC28D13 for ; Thu, 25 Aug 2022 13:05:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9000F10E1F9; Thu, 25 Aug 2022 13:05:52 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7778F11B54E for ; Thu, 25 Aug 2022 08:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661417684; 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=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=JjG106Rd4syvV61SMdTaGFUnpvDBnlWKn4u/qPh/3QxN0/4s+Gc3BuRyt0GTPncMmjvFUi 6vHKXTNgeBNv8EZzT7OwHXh6I2mnzre4ZeURK2rOPXsw0fEuDTUGOiPY1wH8HBB8Gz/EN/ NWmhPe1W6daQTok8Wvc/gUIh+SJnxeE= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-347-e0M6Roy8NTO9CObGVJH9SA-1; Thu, 25 Aug 2022 04:54:41 -0400 X-MC-Unique: e0M6Roy8NTO9CObGVJH9SA-1 Received: by mail-ed1-f69.google.com with SMTP id x3-20020a05640226c300b00446ad76aeb5so7664473edd.8 for ; Thu, 25 Aug 2022 01:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=7OWfNCpLdSo1viH5XGsi5IJxCkX8SeFaK11y2Vq0C60=; b=4s/QJYOVMQfeZQja8yh8LdKggK6raszeM6lXfeYEFDbVIW4JmjquYOionUUuSL7OSu 22JUGgDhN3vUh5mXFPtjdnkFze77zJ7DmS2Z9yrjyqqD/OFLfMhFedUwTvGO5eGG3uVr u6n6h0aE/jkDArzCg3P2y2EM2hQSyfP2PpUqS1PuQG/8Q/WoH0//IfpNCvWBIkW2patz 5e44da96bjOOF7cKW4fnvMXf2BckMmNfCdRAMp0Yx4dYQOL4XpJpYgGSr/S0KKlR+R/b dI3dzNWb/D1bwFOI71HIVQG0DUHWiqgyd/g+pecq9OvwNybeThw37bI8ZAOEREBo49R3 qx4Q== X-Gm-Message-State: ACgBeo1LxRBDHWQpb8tZIXcF5VavW+1JgHX5ZipMjAlIKAoWuTXbpxks JZyrbIJWxLT8QlCx5vZJzukMGqbQdDrdcR9IG5ubTG0rTdkeNeq52YiABcC144nZECpcPidd5gC R/BaE1FqfOxYpbufx5upT2t1PnA== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742627ejc.361.1661417679930; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4iRqqUbLSIQozsEoevWSbUBOoNa7wZuPHEqVSEVtqoqW7Rc5PQi4B3ygUaYiDI2xHU+dtygQ== X-Received: by 2002:a17:907:728d:b0:731:8396:ea86 with SMTP id dt13-20020a170907728d00b007318396ea86mr1742616ejc.361.1661417679691; Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b0073d74e1a467sm997841ejn.167.2022.08.25.01.54.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:54:39 -0700 (PDT) Message-ID: <914dec00-65f4-f49c-9ace-39321b88e8b6@redhat.com> Date: Thu, 25 Aug 2022 10:54:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v4 02/31] drm/i915: Don't register backlight when another backlight should be used To: Jani Nikula , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-3-hdegoede@redhat.com> <87v8qhiz4f.fsf@intel.com> From: Hans de Goede In-Reply-To: <87v8qhiz4f.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Thu, 25 Aug 2022 13:05:48 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau@lists.freedesktop.org, intel-gfx , amd-gfx@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Len Brown Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Hi All, On 8/24/22 14:50, Jani Nikula wrote: > On Wed, 24 Aug 2022, 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. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_backlight.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c >> index 681ebcda97ad..a4dd7924e0c1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_backlight.c >> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c >> @@ -8,6 +8,8 @@ >> #include >> #include >> >> +#include >> + >> #include "intel_backlight.h" >> #include "intel_backlight_regs.h" >> #include "intel_connector.h" >> @@ -952,6 +954,11 @@ int intel_backlight_device_register(struct intel_connector *connector) >> >> WARN_ON(panel->backlight.max == 0); >> >> + if (!acpi_video_backlight_use_native()) { >> + DRM_INFO("Skipping intel_backlight registration\n"); > > Could use drm_info with drm_device. Ack, fixed for v5. > Either way, > > Reviewed-by: Jani Nikula Thank you. > and ack for merging via whichever tree suits you best. My plan is to create a branch with the series on top of 6.0-rc1 and then send a pull-req to all involved trees. So far there are no conflicts between this branch and drm-tip... Regards, Hans >> + return 0; >> + } >> + >> memset(&props, 0, sizeof(props)); >> props.type = BACKLIGHT_RAW; >