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 134DDCD5BD1 for ; Sun, 31 May 2026 11:49:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A23CE112AEF; Sun, 31 May 2026 11:49:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="LQeuNW5E"; dkim-atps=neutral Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB2DE112AEA; Sun, 31 May 2026 11:49:19 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id A13B140C4D; Sun, 31 May 2026 11:49:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BF221F00899; Sun, 31 May 2026 11:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780228159; bh=U2k+F91HwjQrpVP3BVgcbCSYpcxAxV57CRaPIrFsxM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LQeuNW5EHjGT/VvCYkNCvBXhrcBu4uDTVK/feGdJaTxwubjSbpfAAg6EcKjqhlrVm lf8I9SG4ey2w/SXopeNY/jWVyWKZHTTAlzBDTjVjFXvJs33g47kglV3Yv0evaxXWOP G6DC9MeEeOfGa09sTKOycXHNZCBoqbiRw2Z4MMhrMb1on/mz9S6OW0jiympVqm6ld6 fqVQFrXgSzt+XQwt7oNgayJChC+vE1ws4lWNgGEGrxzWUGqbd9yWezPGDQvaDb3WMP dJLCsEaqUK01aHaJEJWMuJYIAvsaaTdsdhbTK080OJKvloVfrcnbwZBEjotayZIxio hEQcK5UxTAcBA== From: "Mario Limonciello (AMD)" To: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org, "Mario Limonciello (AMD)" Subject: [PATCH v5 06/11] drm/amd/display: Allow backlight registration to fail Date: Sun, 31 May 2026 06:49:03 -0500 Message-ID: <20260531114908.1693426-7-superm1@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260531114908.1693426-1-superm1@kernel.org> References: <20260531114908.1693426-1-superm1@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" [Why] If backlight registration fails then it's ignored. This could hide a fatal problem to a user. [How] Pass error codes up from backlight registration failures. Signed-off-by: Mario Limonciello (AMD) --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index de9b29ad6cab..430b7d3d8930 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5478,7 +5478,7 @@ static const struct backlight_ops amdgpu_dm_backlight_ops = { .update_status = amdgpu_dm_backlight_update_status, }; -static void +static int amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) { struct drm_device *drm = aconnector->base.dev; @@ -5489,15 +5489,16 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) int min, max; int real_brightness; int init_brightness; + int r; if (aconnector->bl_idx == -1) - return; + return 0; if (!acpi_video_backlight_use_native()) { drm_info(drm, "Skipping amdgpu DM backlight registration\n"); /* Try registering an ACPI video backlight device instead. */ acpi_video_register_backlight(); - return; + return 0; } caps = &dm->backlight_caps[aconnector->bl_idx]; @@ -5531,22 +5532,26 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) dm->brightness[aconnector->bl_idx] = props.brightness; if (IS_ERR(dm->backlight_dev[aconnector->bl_idx])) { - drm_err(drm, "DM: Backlight registration failed!\n"); + r = PTR_ERR(dm->backlight_dev[aconnector->bl_idx]); + drm_err(drm, "DM: Backlight registration failed: %d\n", r); dm->backlight_dev[aconnector->bl_idx] = NULL; - } else { - /* - * dm->brightness[x] can be inconsistent just after startup until - * ops.get_brightness is called. - */ - real_brightness = - amdgpu_dm_backlight_ops.get_brightness(dm->backlight_dev[aconnector->bl_idx]); + return r; + } - if (real_brightness != init_brightness) { - dm->actual_brightness[aconnector->bl_idx] = real_brightness; - dm->brightness[aconnector->bl_idx] = real_brightness; - } - drm_dbg_driver(drm, "DM: Registered Backlight device: %s\n", bl_name); + /* + * dm->brightness[x] can be inconsistent just after startup until + * ops.get_brightness is called. + */ + real_brightness = + amdgpu_dm_backlight_ops.get_brightness(dm->backlight_dev[aconnector->bl_idx]); + + if (real_brightness != init_brightness) { + dm->actual_brightness[aconnector->bl_idx] = real_brightness; + dm->brightness[aconnector->bl_idx] = real_brightness; } + drm_dbg_driver(drm, "DM: Registered Backlight device: %s\n", bl_name); + + return 0; } static int initialize_plane(struct amdgpu_display_manager *dm, @@ -8078,7 +8083,9 @@ amdgpu_dm_connector_late_register(struct drm_connector *connector) return r; } - amdgpu_dm_register_backlight_device(amdgpu_dm_connector); + r = amdgpu_dm_register_backlight_device(amdgpu_dm_connector); + if (r) + return r; if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) || (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) { -- 2.54.0