Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2507062pxb; Mon, 19 Apr 2021 07:20:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSs6PSG2Kf9pEr9cZCVPDD4o7eBTtPRWVupngFm2w9dpwsKhjxMsMveVj6p90jM0fNvllb X-Received: by 2002:a05:6402:cb4:: with SMTP id cn20mr10851521edb.167.1618842055491; Mon, 19 Apr 2021 07:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842055; cv=none; d=google.com; s=arc-20160816; b=Kt1lC8lnmrOgby4689KzUdljNRQ9wJGd5ldoWmP2KHibY1au8YLv6qiA+UpNdx2Yod B8wLyfv4pzJiaiB3DBbNGn9CUoJ3l3rTx+CB/bjqiKPXg+/udQuwQk8mMI/klcXdjcuO aLnMfuKi3qDInYEEcRRSy3LvGpTLn5+SNlkSqIzf2t5BkgLc7JM+T+sJJRw/mkGW0q+N /T36YWmNVVJ4zQ+Aed17+MOam4OoGC+v2BYb8g9DaPv7dM9YDUxEJGqy08HTtubPU2Wu C8sQ+0cZOTyRlCJqwQkx3I5S3/5JCg3h9A61nf0EcIjPwUftU+xW68et2Uw0WFuIK7kO pp7A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bDDYXPjopcO+L6uHn5amCZkiiFQ+a4LJROBYb0fz+GY=; b=QJh/t1hQri5oF8r/rkyRqpr2RY6eSf4EToogsvBQdxgpWH2pICVOFazPlMUZzc1jox h7Uv81A4GN/HS4d+vSfxXcEH+nhJbW/zlyxJrxUHfp+6HG/1l6J40Q1qJDU8Tx5R62Ku EnbP16o7D9SL+Oxk3aE5krPbuy3y8BYpxX8heiMGBA0rFFSyZDkmbHk0latuwXT6piQs mZ9pDd7r+LxmriBHouk4gu/Cnob5UhhEuzRSaHmGrfudWwNHKtNqMrT10X7158CVyZgt brxN3oh7nX6agrGOxpliIIkvh5BjC/j4yddhLrqwLN3dlZxioeFZ/vQYSlLlxBRoAg/h 4Fow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ASBtOp9V; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y18si11576507edc.219.2021.04.19.07.20.31; Mon, 19 Apr 2021 07:20:55 -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=@linuxfoundation.org header.s=korg header.b=ASBtOp9V; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239464AbhDSNLZ (ORCPT + 99 others); Mon, 19 Apr 2021 09:11:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:44618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239691AbhDSNKL (ORCPT ); Mon, 19 Apr 2021 09:10:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CE1446128C; Mon, 19 Apr 2021 13:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618837780; bh=FNUg1XRVrOeOXuEXVMppXQbDhVGuqH6mQqna3Sckp14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ASBtOp9V0MwBfByjzNhIOw7GX6vBIDsJHNgZe5JPklx8W9sNiYSbFqX1HD/FQu78G 4oCvvX5cXE2z2Si9gDC4gFIX5iqvr4lHhIc9GCx7SBaPUz2I8k8Wp2Ltv2UFm49wG/ rMeapWJ1+J1ihf8qK941sapRHrPXiuJFcu0jyKXQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qingqing Zhuo , Nicholas Kazlauskas , Alex Deucher , Sasha Levin Subject: [PATCH 5.11 051/122] drm/amd/display: Add missing mask for DCN3 Date: Mon, 19 Apr 2021 15:05:31 +0200 Message-Id: <20210419130531.916920290@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130530.166331793@linuxfoundation.org> References: <20210419130530.166331793@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qingqing Zhuo [ Upstream commit df7232c4c676be29f1cf45058ec156c1183539ff ] [Why] DCN3 is not reusing DCN1 mask_sh_list, causing SURFACE_FLIP_INT_MASK missing in the mapping. [How] Add the corresponding entry to DCN3 list. Signed-off-by: Qingqing Zhuo Reviewed-by: Nicholas Kazlauskas Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h index 5fa150f34c60..2e89acf46e54 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h @@ -133,6 +133,7 @@ HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_EN, mask_sh),\ HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK, mask_sh),\ HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK_C, mask_sh),\ + HUBP_SF(HUBPREQ0_DCSURF_SURFACE_FLIP_INTERRUPT, SURFACE_FLIP_INT_MASK, mask_sh),\ HUBP_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\ HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CB_B, mask_sh),\ HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CR_R, mask_sh),\ -- 2.30.2