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,USER_AGENT_GIT autolearn=ham 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 6F8D8C2D0CE for ; Sun, 29 Dec 2019 17:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EFA6206A4 for ; Sun, 29 Dec 2019 17:46:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641607; bh=n66rELhtRP7TuDCSuJ2fjZ2102XfdZBQlIS6TWQiDGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Hwhxm0W/xQN8ozT14ZNO2UbqUOI44FgImI/f3HmKjYAdHLNJs5sP4NWXvp5/tJT59 voIKbd4AasbvMUTqVhgkRVbqBUgyoTr9PNJXHGAhNqEd+3b1dq/VGl+4VDapifX9Gq ZzLn50qPaQUn/cFZC4eLsgzMmXkHRmX+xBm0WdM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730841AbfL2Rqq (ORCPT ); Sun, 29 Dec 2019 12:46:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:56790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731124AbfL2Rqp (ORCPT ); Sun, 29 Dec 2019 12:46:45 -0500 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 1A01820718; Sun, 29 Dec 2019 17:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641605; bh=n66rELhtRP7TuDCSuJ2fjZ2102XfdZBQlIS6TWQiDGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h+0gUGqdwfcb1pHzQHzIRqeWHS9GiBIPY72YdVNGM8bl3e5/MPKzD6PkDpcQEWvJo 0ALBAr6SoGrxkimHHUw7xJG4V3OXB9+Vyrg11Q/wzXW7JGo5R0/Qh+/MEV3iXpNaO6 duVs5WpUjd9kWlfE545ZyXSeCBk4Ilog669EBcrQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josip Pavic , Anthony Koo , Bhawanpreet Lakha , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 134/434] drm/amd/display: wait for set pipe mcp command completion Date: Sun, 29 Dec 2019 18:23:07 +0100 Message-Id: <20191229172710.609979700@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@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 From: Josip Pavic [ Upstream commit 15caeabc5787c15babad7ee444afe9c26df1c8b3 ] [Why] When the driver sends a pipe set command to the DMCU FW, it does not wait for the command to complete. This can lead to unpredictable behavior if, for example, the driver were to request a pipe disable to the FW via MCP, then power down some hardware before the firmware has completed processing the command. [How] Wait for the DMCU FW to finish processing set pipe commands Signed-off-by: Josip Pavic Reviewed-by: Anthony Koo Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 3 +++ 1 file changed, 3 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 58bd131d5b48..7700a855d77c 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c @@ -77,6 +77,9 @@ static bool dce_abm_set_pipe(struct abm *abm, uint32_t controller_id) /* notifyDMCUMsg */ REG_UPDATE(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 1); + REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0, + 1, 80000); + return true; } -- 2.20.1