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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 8A715C5ACC0 for ; Mon, 16 Mar 2020 02:37:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56837206E9 for ; Mon, 16 Mar 2020 02:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584326242; bh=7VAsGNAFAa6wIG1YrBMZI+NGgGY/usWxa71Rzj1Z1rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rZ+Bqeq/7MJB7Cee5TGMn6adueXkGksXzp5Hbl2r27xyDXKgDWyp/X3OU+J0sKzeU lN5TE4aPZxnRRsQPhtwB4mvRifyN09voYD4TeVzMXX3+61WCNWnOkL7WdPHSNTspzY +N1b84bwgxRmKfzZ2bHkkFT0hQAE2f6yMWNE+PeY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730144AbgCPCfX (ORCPT ); Sun, 15 Mar 2020 22:35:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:39482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730103AbgCPCfO (ORCPT ); Sun, 15 Mar 2020 22:35:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE4132072A; Mon, 16 Mar 2020 02:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584326113; bh=7VAsGNAFAa6wIG1YrBMZI+NGgGY/usWxa71Rzj1Z1rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CcQyjDbxY+RFRmCGmV3GmkzPBlU6VVey1P+YE1a9kr3E6mRRALUFIJSnCiYUPRmcm AaLrPLvNt2VQpKZK0t4ujEzBfpIlujji/teLWlfjDsWGvqHG0EKCJ8/Su2QKaCV6ma LwCYpSOQ4f28OaO4XaMztFTkrqiCQjpB32GooIsk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josip Pavic , Aric Cyr , Rodrigo Siqueira , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 16/20] drm/amd/display: fix dcc swath size calculations on dcn1 Date: Sun, 15 Mar 2020 22:34:49 -0400 Message-Id: <20200316023453.1800-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316023453.1800-1-sashal@kernel.org> References: <20200316023453.1800-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 a0275dfc82c9034eefbeffd556cca6dd239d7925 ] [Why] Swath sizes are being calculated incorrectly. The horizontal swath size should be the product of block height, viewport width, and bytes per element, but the calculation uses viewport height instead of width. The vertical swath size is similarly incorrectly calculated. The effect of this is that we report the wrong DCC caps. [How] Use viewport width in the horizontal swath size calculation and viewport height in the vertical swath size calculation. Signed-off-by: Josip Pavic Reviewed-by: Aric Cyr Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c index 1ea91e153d3a6..c1adac888fd83 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c @@ -684,8 +684,8 @@ static void hubbub1_det_request_size( hubbub1_get_blk256_size(&blk256_width, &blk256_height, bpe); - swath_bytes_horz_wc = height * blk256_height * bpe; - swath_bytes_vert_wc = width * blk256_width * bpe; + swath_bytes_horz_wc = width * blk256_height * bpe; + swath_bytes_vert_wc = height * blk256_width * bpe; *req128_horz_wc = (2 * swath_bytes_horz_wc <= detile_buf_size) ? false : /* full 256B request */ -- 2.20.1