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 A4A38C32796 for ; Wed, 24 Aug 2022 12:47:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236354AbiHXMrS (ORCPT ); Wed, 24 Aug 2022 08:47:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234876AbiHXMrR (ORCPT ); Wed, 24 Aug 2022 08:47:17 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2392591D34; Wed, 24 Aug 2022 05:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661345236; x=1692881236; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=svJpu/aAhxTW7SBWGKYeIaIuCtBuBU2tQ9RclprRDV0=; b=BgHVOL+NjYbfrLROLAVETTGHLXEFD3ObQ1Jf3pi9I7SBhRD4PTCfITtZ 7OOAaNCuFQDOG1NZ5W71zBfGPYOilXM4ALhw4+O6+CJWZAB+iouletE5y gkq9SLldmL1FGeiOeS9zJgIzmfaVaigUZki0yCsVKCJDh1BTJTMtdsbh0 VO/RxXhuDSXHD2XKwPk0T3AOkOIFelLyWpcOx+DKJhXr0zqZot1Axj8gE m2Jj8WfYbHdnBLxv+I0VhWL8muQnF69CZbm7KNkbxwp7YPwUu4l5EonQH 5imt3wNVgXkptkbYKE7ijOAZ2IHQMq2EfV6gVZJ2ae382z2E98oGh/mRW A==; X-IronPort-AV: E=McAfee;i="6500,9779,10448"; a="273703822" X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="273703822" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2022 05:47:15 -0700 X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="639103382" Received: from zlim2-mobl.gar.corp.intel.com (HELO localhost) ([10.252.52.23]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2022 05:47:08 -0700 From: Jani Nikula To: Hans de Goede , Ben Skeggs , Karol Herbst , Lyude , Daniel Dadap , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Alex Deucher , Christian =?utf-8?Q?K=C3=B6nig?= , "Pan, Xinhui" , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Mark Gross , Andy Shevchenko Cc: Hans de Goede , 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 Subject: Re: [PATCH v4 11/31] drm/i915: Call acpi_video_register_backlight() (v2) In-Reply-To: <20220824121523.1291269-12-hdegoede@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220824121523.1291269-1-hdegoede@redhat.com> <20220824121523.1291269-12-hdegoede@redhat.com> Date: Wed, 24 Aug 2022 15:47:05 +0300 Message-ID: <87y1vdizau.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Wed, 24 Aug 2022, Hans de Goede wrote: > On machins without an i915 opregion the acpi_video driver immediately > probes the ACPI video bus and used to also immediately register > acpi_video# backlight devices when supported. > > Once the drm/kms driver then loaded later and possibly registered > a native backlight device then the drivers/acpi/video_detect.c code > unregistered the acpi_video0 device to avoid there being 2 backlight > devices (when acpi_video_get_backlight_type()==native). > > This means that userspace used to briefly see 2 devices and the > disappearing of acpi_video0 after a brief time confuses the systemd > backlight level save/restore code, see e.g.: > https://bbs.archlinux.org/viewtopic.php?id=269920 > > To fix this the ACPI video code has been modified to make backlight class > device registration a separate step, relying on the drm/kms driver to > ask for the acpi_video backlight registration after it is done setting up > its native backlight device. > > Add a call to the new acpi_video_register_backlight() after the i915 calls > acpi_video_register() (after setting up the i915 opregion) so that the > acpi_video backlight devices get registered on systems where the i915 > native backlight device is not registered. > > Changes in v2: > -Only call acpi_video_register_backlight() when a panel is detected > > Signed-off-by: Hans de Goede > --- > drivers/gpu/drm/i915/display/intel_display.c | 8 ++++++++ > drivers/gpu/drm/i915/display/intel_panel.c | 3 +++ > drivers/gpu/drm/i915/i915_drv.h | 2 ++ > 3 files changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 6103b02c081f..2bb53efdb149 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -9088,6 +9088,14 @@ void intel_display_driver_register(struct drm_i915_private *i915) > /* Must be done after probing outputs */ > intel_opregion_register(i915); > acpi_video_register(); > + /* > + * Only call this if i915 is driving the internal panel. If the internal > + * panel is not driven by i915 then another GPU driver may still register > + * a native backlight driver later and this should only be called after > + * any native backlights have been registered. > + */ > + if (i915->have_panel) > + acpi_video_register_backlight(); Apologies for procrastinating the review. Please let's not add new flags like have_panel to i915; we're trying to clean it up instead. The code here needs to iterate over the connectors to decide. Maybe better abstracted a function. BR, Jani. > > intel_audio_init(i915); > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 237a40623dd7..4536c527f50c 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -646,8 +646,11 @@ intel_panel_mode_valid(struct intel_connector *connector, > > int intel_panel_init(struct intel_connector *connector) > { > + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct intel_panel *panel = &connector->panel; > > + dev_priv->have_panel = true; > + > intel_backlight_init_funcs(panel); > > drm_dbg_kms(connector->base.dev, > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 69ce6db6a7c1..14b0dcaf25c2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -756,6 +756,8 @@ struct drm_i915_private { > > bool ipc_enabled; > > + bool have_panel; > + > struct intel_audio_private audio; > > struct i915_pmu pmu; -- Jani Nikula, Intel Open Source Graphics Center