From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 055/304] drm/amd/display: fix gamma not being applied correctly Date: Mon, 28 Jan 2019 10:39:32 -0500 Message-ID: <20190128154341.47195-55-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128154341.47195-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: Alex Deucher , Sasha Levin , Murton Liu , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTXVydG9uIExpdSA8bXVydG9uLmxpdUBhbWQuY29tPgoKWyBVcHN0cmVhbSBjb21taXQg OGNlNTA0YjkzODliZTg0NmJjZGY1MTJlZDViZThmNjYxYjNiZjA5NyBdCgpbd2h5XQpHYW1tYSB3 YXMgYWx3YXlzIGJlaW5nIHNldCBhcyBpZGVudGl0eSBvbiBTRFIgbW9uaXRvciwKbGVhZGluZyB0 byBubyBjaGFuZ2VzIGluIGdhbW1hLiBUaGlzIGNhdXNlZCBuaWdodGxpZ2h0IHRvCm5vdCBhcHBs eSBjb3JyZWN0bHkuCgpbaG93XQpBZGRlZCBhIGRlZmF1bHQgZ2FtbWEgc3RydWN0dXJlIHRvIGNv bXBhcmUgYWdhaW5zdAppbiB0aGUgc2RyIGNhc2UuCgpTaWduZWQtb2ZmLWJ5OiBNdXJ0b24gTGl1 IDxtdXJ0b24ubGl1QGFtZC5jb20+ClJldmlld2VkLWJ5OiBLcnVub3NsYXYgS292YWMgPEtydW5v c2xhdi5Lb3ZhY0BhbWQuY29tPgpBY2tlZC1ieTogQmhhd2FucHJlZXQgTGFraGEgPEJoYXdhbnBy ZWV0Lkxha2hhQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVy LmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJu ZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9o d19zZXF1ZW5jZXIuYyB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCmluZGV4IDE5MzE4NGFmZmVmYi4uMzJlNGM2 NTNiMWI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAv ZGNuMTBfaHdfc2VxdWVuY2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCkBAIC0xMjI2LDcgKzEyMjYsOCBAQCBzdGF0aWMg Ym9vbCBkY24xMF9zZXRfaW5wdXRfdHJhbnNmZXJfZnVuYyhzdHJ1Y3QgcGlwZV9jdHggKnBpcGVf Y3R4LAogCQl0ZiA9IHBsYW5lX3N0YXRlLT5pbl90cmFuc2Zlcl9mdW5jOwogCiAJaWYgKHBsYW5l X3N0YXRlLT5nYW1tYV9jb3JyZWN0aW9uICYmCi0JCSFwbGFuZV9zdGF0ZS0+Z2FtbWFfY29ycmVj dGlvbi0+aXNfaWRlbnRpdHkKKwkJIWRwcF9iYXNlLT5jdHgtPmRjLT5kZWJ1Zy5hbHdheXNfdXNl X3JlZ2FtbWEKKwkJJiYgIXBsYW5lX3N0YXRlLT5nYW1tYV9jb3JyZWN0aW9uLT5pc19pZGVudGl0 eQogCQkJJiYgZGNlX3VzZV9sdXQocGxhbmVfc3RhdGUtPmZvcm1hdCkpCiAJCWRwcF9iYXNlLT5m dW5jcy0+ZHBwX3Byb2dyYW1faW5wdXRfbHV0KGRwcF9iYXNlLCBwbGFuZV9zdGF0ZS0+Z2FtbWFf Y29ycmVjdGlvbik7CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9hbWQtZ2Z4Cg== 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 77C0EC282CD for ; Mon, 28 Jan 2019 15:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49AD521741 for ; Mon, 28 Jan 2019 15:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690339; bh=R/tgEZAfbGwJhjaefn86eutFsyBFRhyC6ueHvS8uFuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ed5OSP3GGNd6SIOrNCl1fyXBhQ7Izxb45ctj7/YPpU4L+xEEMTyioYDgP/J0yqEv4 KwHvujnLQ2yf4NGZriuhiga2TmHIIJJQVMfhAXunvC/u/caoG6JsqtbIucnucn4hlF n5oU2txrApdoYoMzv401WunamCjaD3EXV4hJr/1Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727829AbfA1Pph (ORCPT ); Mon, 28 Jan 2019 10:45:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:58962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727797AbfA1Ppf (ORCPT ); Mon, 28 Jan 2019 10:45:35 -0500 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 7D38821741; Mon, 28 Jan 2019 15:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690335; bh=R/tgEZAfbGwJhjaefn86eutFsyBFRhyC6ueHvS8uFuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1MdFyCimOzu+881Rx6kElc3T794zF0lexqodT81Z8iRlsZJzEJkYZljd5kkEp5+NK dD7k1PyqezSSJ2U/AnsapR43ix1RWS8UKwT9/63/gERamWzsiXM03HwYv29Gf4ni/X lV//lt++1YnhW+1FKmgnny+0ECyD6EGDzG2wzcBk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Murton Liu , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 055/304] drm/amd/display: fix gamma not being applied correctly Date: Mon, 28 Jan 2019 10:39:32 -0500 Message-Id: <20190128154341.47195-55-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 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: Murton Liu [ Upstream commit 8ce504b9389be846bcdf512ed5be8f661b3bf097 ] [why] Gamma was always being set as identity on SDR monitor, leading to no changes in gamma. This caused nightlight to not apply correctly. [how] Added a default gamma structure to compare against in the sdr case. Signed-off-by: Murton Liu Reviewed-by: Krunoslav Kovac Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 193184affefb..32e4c653b1b4 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -1226,7 +1226,8 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx, tf = plane_state->in_transfer_func; if (plane_state->gamma_correction && - !plane_state->gamma_correction->is_identity + !dpp_base->ctx->dc->debug.always_use_regamma + && !plane_state->gamma_correction->is_identity && dce_use_lut(plane_state->format)) dpp_base->funcs->dpp_program_input_lut(dpp_base, plane_state->gamma_correction); -- 2.19.1