Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4569018pxv; Tue, 6 Jul 2021 04:17:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPHCXN1WjA+qOlwuvzAbDZVW+ta4DIxsoB+rcBwRj5qxLAFmRwBGsk3i37rMwTabBS1YNB X-Received: by 2002:a05:6638:1ba:: with SMTP id b26mr2332456jaq.20.1625570227432; Tue, 06 Jul 2021 04:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570227; cv=none; d=google.com; s=arc-20160816; b=a61qTAZ7uHKiHvp4ySJMn2p2SzVja409RM61qDnjmBXNUyH6o/JIY8PtpDrD+xjGGA /qO2Tkljd9eatmvJkPJzS/hdAMaJ0kX6dfyIfCBDBvBx8lPgjbah1aCVlcLyAQV6XI48 XIV2Gt/U7OcP7QeyBq+X2L9ZABzzu9bdHmJ4duJX77Pdg311b/x6O45LDAizfS+TyRXY sa5fCtbKOV2Oh8kjBBjh8WBBXhNiKW3kMU+6n6SZ0s17OJlWvzDKhUbtGFiGLP8Orf7b Cn/CqYbyCT87HvFGUxRg5/ePjd5VGIH3EZ9VXlRT5ybi8OoN0oxQ7wbNFPM1Vc5I3QSK BUNw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bLKRWFeb6muLAOq0HgFucUUoxPA4qIUZns/km8ZX/uQ=; b=ghzaCzMYPGaEIlrLqC4ducvdNGB7B0W7Ec87fhEQi5UeJllnKXnStH+uReTsqpO7GW yWGep45OljXjvRHmeyVh0Thu9yjXfSZ8CDpK3Pcqd589qGbjb4MamJhRlfK++q34vMdr kerIaz1BtHel9oV0UFgBXt67reVGrWsgqrgROsoOWt/dmwL/PkXYmCzma5FHH3r4FRsG MQrSYHf5skXNqxcsWHUCCvuf8Kl+d8X5mKZV5sUQqS6LeEEACE7LYq8h2ZT5pUykZLKW mWzPDZVtjxleO+aniq53VK25HMiwisW+YQ/3pWGyi0De1DTvun1ZhIbx9vdQvhJbidLn hMpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ize0dZTO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id az23si4150965jab.13.2021.07.06.04.16.54; Tue, 06 Jul 2021 04:17:07 -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=@kernel.org header.s=k20201202 header.b=Ize0dZTO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232648AbhGFLSs (ORCPT + 99 others); Tue, 6 Jul 2021 07:18:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:53196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232202AbhGFLRl (ORCPT ); Tue, 6 Jul 2021 07:17:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B5C1561A14; Tue, 6 Jul 2021 11:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570103; bh=woZHgorVR7Q0m33QF4ihy7qs1+znD/0nAYjA2QP/kTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ize0dZTODvAeupeSDMYUtdXXCB/tfgFhrbT3QhhEP1T6HxO+3y2nk4He4V2d2oOim 68QW0T8CN5D7IwZf+buAvrpLBe8HETW5n9jWzyIKkxWL2En/qEEn9vqwN1i7/6gnee +4DB1AVsWwtR6s9KIcVxYuekTx0/Rt6ZmyOVMhoBTdSoebhng+l74nSuD91VfN10Ge hY+BJMubt8BPJJG/Zdghy+abp7lQ9mPfsgooz9g+on2xU64719ZAGJHaJFjMqiZEC6 N/76Vxt1K/hNyucJjSYJU09zpPhcR/rZPmGRjpwZ3RKNQOLldy/4bGQu4H54rb195N TVz4kxYpb1kmw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Harry Wentland , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 037/189] drm/amdgpu/display: restore the backlight on modeset (v2) Date: Tue, 6 Jul 2021 07:11:37 -0400 Message-Id: <20210706111409.2058071-37-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit 7230362c78d441020a47d7d5ca81f8a3d07bd9f0 ] To stay consistent with the user's setting. v2: rebase on multi-eDP support Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1337 Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+) 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 875fd187463e..62663e287b21 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8967,6 +8967,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) /* Update audio instances for each connector. */ amdgpu_dm_commit_audio(dev, state); +#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \ + defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE) + /* restore the backlight level */ + if (dm->backlight_dev) + amdgpu_dm_backlight_set_level(dm, dm->brightness[0]); +#endif /* * send vblank event on all events not handled in flip and * mark consumed event for drm_atomic_helper_commit_hw_done -- 2.30.2