Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5469871pxu; Tue, 22 Dec 2020 19:07:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyhHs1sbc54ynU4HryCS6/j93+GBDaD/QOTuY3IkE35DzcDWfzevhOoxAznxlgkE0n2wWB X-Received: by 2002:a17:906:7f83:: with SMTP id f3mr12584978ejr.282.1608692864361; Tue, 22 Dec 2020 19:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692864; cv=none; d=google.com; s=arc-20160816; b=EXRkGtxxJ1cQhMQJWIk7CcDEpJ5oGB7dQU/peprvJ6m4sgae/8y7m6c4rab24PAhWT CJ5NKpTlMhSr2alY3Q/8SAmwGFNgSjeHi0/qtRDEbPVndcTGbfHlUMRnAU+Oc+62mZt4 2oIvimHFaQdn9ekAKb3yYIbFECNp9/1AxgNz44xaKLQITqHD4D/947LxNf3lA7mChyLU 3K9XkMav2pywIOxxx5znmjEcsAEWaiWGp/eMyNICIAsBTK6we0x9U775HgRHfzx1O3Ai XSf8g9eGFpMGn/TIlylhXdXmgW6VYRVmlyd0xxTqEhPPuQ8CV/qsLbQibIa2AyEwimvZ EkkA== 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=dhBkou6JhLLtKI9xHsooz1ZnOeBzGcTdWPjFLa+vcnY=; b=hj0TRjp6Mgya8DCSDYwiX7xzyAPk7BPHnctf+zD4kC1jtfYwWE/Ucj50rbCoykA0/4 vK9+q838r50HVDL1bB/gXZiQeQHmo62TSFKc4GwVcjnq3RSZPR2iXvZrAruntnVhUk4S tBpoFmD6wWXo8zmo9x/p9n8/0ZTmyot0uTcn6M86ErCY1u6ewi2spC6cnGIm4BqEIN6o tplDH+tJn4wlMNYQdtwokWLdJQ6XbugrEFiHqW0+qwdaLRavUTvhN+o3/pFehTfvi0px sgjbP95OZgRzGqpxQL6QdMkiV1PC6oNfArM6MXAzHFSVfs38xNSK3Ui+ixT7IpSVHt6k l7Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Wh5Ri9Xg; 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 c9si13580912edr.4.2020.12.22.19.07.21; Tue, 22 Dec 2020 19:07:44 -0800 (PST) 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=Wh5Ri9Xg; 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 S1731684AbgLWDF4 (ORCPT + 99 others); Tue, 22 Dec 2020 22:05:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:46436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728507AbgLWCTI (ORCPT ); Tue, 22 Dec 2020 21:19:08 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 76E8322AAF; Wed, 23 Dec 2020 02:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689901; bh=k+KP1tuGcuhlVuyY6CcMcv0749L9TvC6cHzejnZqKPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wh5Ri9XgweVubyXZJ5HqCVqWk2n7L8zMSfHEqBf+fGUyqXAxAlDaBc0Oe8JEH25xG SfGveqxPlrqos2LyC9lW5xo/FVS16cPyHV5QiDExhyQrq/IITXEG5Oy54XcrnbEEVE XaSRT4juz1br3UE0+q0MtRJfE4LmvMLfnX449BXEJfE3kmw4jbs2mn7p7qiongg4Fz U00WpRml9aMzz0P2BU5jTWX46fzpPtYWBWHQw00yp7jNHLWe2WAhuZkyhVqFDwfG+J 5duht/47wARel9elprbGT0RnlrnsIC581cd/IkvGQCi1U5dTPGECLYZThNeO/UZWzo GYJpBmqc7eqdQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bas Nieuwenhuizen , Alex Deucher , Nicholas Kazlauskas , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 006/130] drm/amd/display: Do not silently accept DCC for multiplane formats. Date: Tue, 22 Dec 2020 21:16:09 -0500 Message-Id: <20201223021813.2791612-6-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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: Bas Nieuwenhuizen [ Upstream commit b35ce7b364ec80b54f48a8fdf9fb74667774d2da ] Silently accepting it could result in corruption. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Alex Deucher Reviewed-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d2dd387c95d86..ce70c42a2c3ec 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2734,7 +2734,7 @@ fill_plane_dcc_attributes(struct amdgpu_device *adev, return 0; if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) - return 0; + return -EINVAL; if (!dc->cap_funcs.get_dcc_compression_cap) return -EINVAL; -- 2.27.0