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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D9B1C41514 for ; Wed, 14 Aug 2019 17:26:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D5512173E for ; Wed, 14 Aug 2019 17:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803589; bh=wJr2imQIhqz78PABkJl03BKNNEItmgv7L8ODU/LnUmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ai0gR5VG915q/Bft83OqDj5tYBMZeB02v5mF/hxUDzlUxipqc8/CDG5pbueGMIU4D 0Ed8CxjFM/yqme6L4aTcN66WK2qLoq0X7GtJdih5eRA9FlBQaVNPU5mrfOUI53PdQu 84PsnNa3HUpO9SfOat1U6nagtlcq1HrAHTGMFtXM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728461AbfHNREp (ORCPT ); Wed, 14 Aug 2019 13:04:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:53590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728681AbfHNREp (ORCPT ); Wed, 14 Aug 2019 13:04:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CD6E2084D; Wed, 14 Aug 2019 17:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802284; bh=wJr2imQIhqz78PABkJl03BKNNEItmgv7L8ODU/LnUmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jezazGSMgR947ioeCVoWOC0F7n/9VNU8FiBDeND/D6qz6xzDjwUQB7vSL1b+NtMb8 tqhkTFnisMaTH+ivUjCcDPVDbf8lg3s9Zax3lvO2T2k95w1Ko0eTvY9+a0385PalhY 00E/kdvVLMffUZgPbFfc5cmhviXYBp0ymp8Xm86I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, SivapiriyanKumarasamy , Anthony Koo , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.2 066/144] drm/amd/display: Wait for backlight programming completion in set backlight level Date: Wed, 14 Aug 2019 19:00:22 +0200 Message-Id: <20190814165802.599863968@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit c7990daebe71d11a9e360b5c3b0ecd1846a3a4bb ] [WHY] Currently we don't wait for blacklight programming completion in DMCU when setting backlight level. Some sequences such as PSR static screen event trigger reprogramming requires it to be complete. [How] Add generic wait for dmcu command completion in set backlight level. Signed-off-by: SivapiriyanKumarasamy Reviewed-by: Anthony Koo Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c index 2959c3c9390b9..da30ae04e82bb 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c @@ -234,6 +234,10 @@ static void dmcu_set_backlight_level( s2 |= (backlight_8_bit << ATOM_S2_CURRENT_BL_LEVEL_SHIFT); REG_WRITE(BIOS_SCRATCH_2, s2); + + /* waitDMCUReadyForCmd */ + REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, + 0, 1, 80000); } static void dce_abm_init(struct abm *abm) -- 2.20.1