From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 035/171] drm/amd/display: Reset planes for color management changes Date: Thu, 18 Jul 2019 23:54:26 -0400 Message-ID: <20190719035643.14300-35-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190719035643.14300-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Leo Li , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , Harry Wentland , Nicholas Kazlauskas RnJvbTogTmljaG9sYXMgS2F6bGF1c2thcyA8bmljaG9sYXMua2F6bGF1c2thc0BhbWQuY29tPgoK WyBVcHN0cmVhbSBjb21taXQgNzMxNmM0YWQyOTk2NjNhMTZjYTljZTEzZTVlODE3YjRjYTc2MDgw OSBdCgpbV2h5XQpGb3IgY29tbWl0cyB3aXRoIGFsbG93X21vZGVzZXQ9ZmFsc2UgYW5kIENSVEMg ZGVnYW1tYSBjaGFuZ2VzIHRoZSBwbGFuZXMKYXJlbid0IHJlc2V0LiBUaGlzIHJlc3VsdHMgaW4g aW5jb3JyZWN0IHJlbmRlcmluZy4KCltIb3ddClJlc2V0IHRoZSBwbGFuZXMgd2hlbiBjb2xvciBt YW5hZ2VtZW50IGhhcyBjaGFuZ2VkIG9uIHRoZSBDUlRDLgpUZWNobmljYWxseSB0aGlzIHdpbGwg aW5jbHVkZSByZWdhbW1hIGNoYW5nZXMgYXMgd2VsbCwgYnV0IGl0IGRvZXNuJ3QKcmVhbGx5IGFm dGVyIGxlZ2FjeSB1c2Vyc3BhY2Ugc2luY2UgdGhvc2UgY29tbWl0IHdpdGgKYWxsb3dfbW9kZXNl dD10cnVlLgoKU2lnbmVkLW9mZi1ieTogTmljaG9sYXMgS2F6bGF1c2thcyA8bmljaG9sYXMua2F6 bGF1c2thc0BhbWQuY29tPgpSZXZpZXdlZC1ieTogSGFycnkgV2VudGxhbmQgPEhhcnJ5LldlbnRs YW5kQGFtZC5jb20+CkFja2VkLWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1kLmNvbT4KU2lnbmVk LW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpTaWduZWQt b2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyB8IDQgKysrKwogMSBmaWxlIGNo YW5nZWQsIDQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IDMxNTMwYmZkMDAyYS4uMGU0ODIzNDlhNWNi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtLmMKQEAgLTYzMzEsNiArNjMzMSwxMCBAQCBzdGF0aWMgYm9vbCBzaG91bGRfcmVzZXRfcGxh bmUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCWlmICghbmV3X2NydGNfc3RhdGUp CiAJCXJldHVybiB0cnVlOwogCisJLyogQ1JUQyBEZWdhbW1hIGNoYW5nZXMgY3VycmVudGx5IHJl cXVpcmUgdXMgdG8gcmVjcmVhdGUgcGxhbmVzLiAqLworCWlmIChuZXdfY3J0Y19zdGF0ZS0+Y29s b3JfbWdtdF9jaGFuZ2VkKQorCQlyZXR1cm4gdHJ1ZTsKKwogCWlmIChkcm1fYXRvbWljX2NydGNf bmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCXJldHVybiB0cnVlOwogCi0tIAoyLjIw LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA== 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,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 9E46CC76188 for ; Fri, 19 Jul 2019 03:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F94A21851 for ; Fri, 19 Jul 2019 03:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508695; bh=qM2zHBibiBBO03fWCDDQyTr6ziwHDkUz0cX/k5QHERA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XD5KuNRlzKviJR85+ARY/kEetYyAqGAL5z0KxC5R7jGNkV5rTi5WmUrzhqH9zEFZ9 /g0eC0svOnF034Fh+aLe5PCps8DNVJFhZvO0L8I+BCdGVCYhxPpvX9ouj+PHclQ2ED nO6c9B3WWLUZmgkzi/Pt2bulzA86acrGk7CE+fDk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727861AbfGSD6O (ORCPT ); Thu, 18 Jul 2019 23:58:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:57458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727811AbfGSD6M (ORCPT ); Thu, 18 Jul 2019 23:58:12 -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 188A12184E; Fri, 19 Jul 2019 03:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508691; bh=qM2zHBibiBBO03fWCDDQyTr6ziwHDkUz0cX/k5QHERA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FPhgJ1SYmS/Hn5MmOhfD5/eSUN9IJr6ZZhQp1LrYUbKN72DbK6hHl16325pX8VLSe MJx3NiqECbyw1Wj5okGhYLC8xVPEDUcYPPiyuZ7TXzgGkx4iGXGNU+24a6Ef3nQLVC IGw+pR7MzatuD+HrS7Avms4Cxm2ziQxBM/Ncq1r8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Kazlauskas , Harry Wentland , Leo Li , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 035/171] drm/amd/display: Reset planes for color management changes Date: Thu, 18 Jul 2019 23:54:26 -0400 Message-Id: <20190719035643.14300-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Kazlauskas [ Upstream commit 7316c4ad299663a16ca9ce13e5e817b4ca760809 ] [Why] For commits with allow_modeset=false and CRTC degamma changes the planes aren't reset. This results in incorrect rendering. [How] Reset the planes when color management has changed on the CRTC. Technically this will include regamma changes as well, but it doesn't really after legacy userspace since those commit with allow_modeset=true. Signed-off-by: Nicholas Kazlauskas Reviewed-by: Harry Wentland Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++ 1 file changed, 4 insertions(+) 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 31530bfd002a..0e482349a5cb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6331,6 +6331,10 @@ static bool should_reset_plane(struct drm_atomic_state *state, if (!new_crtc_state) return true; + /* CRTC Degamma changes currently require us to recreate planes. */ + if (new_crtc_state->color_mgmt_changed) + return true; + if (drm_atomic_crtc_needs_modeset(new_crtc_state)) return true; -- 2.20.1