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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 0ECD0C169C4 for ; Mon, 11 Feb 2019 16:11:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D245920700 for ; Mon, 11 Feb 2019 16:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549901471; bh=Pi7zxNGNXnrFqsGW7Qk8jqi+88OOg4kGv2mQ881/gf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c17pjVCQ/UMClhaiX//mrzN1n52AeGFqtl6JFNdsCHmFCGa0cyQ/Hjklh3dJrfJiR Qa1q0z9LkMfBjiv3eZ6l/rcpokNTT5vVMPndSwCWvVBeIqttbwv+AxPDQF0TIgxlYo p3ipuD0sVHVB/wxWQq5hZPijf/VfHRHUPTBOV1os= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727199AbfBKQKn (ORCPT ); Mon, 11 Feb 2019 11:10:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:57628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728239AbfBKOYZ (ORCPT ); Mon, 11 Feb 2019 09:24:25 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ECC2C20821; Mon, 11 Feb 2019 14:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895064; bh=Pi7zxNGNXnrFqsGW7Qk8jqi+88OOg4kGv2mQ881/gf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lbXt9G2l0WeFRIN5JxHkV449qBh5i9kx013901WsXU0kd11Tv3K0rYK/RIJCD9sl5 kn62B1DOB5RXITvwMnfvbQvhYP5oQSiOzEeSYo+YG0Nwp5SJE0ulvolck3qsp6FALm 6Jhzyyc9LdBOurcG73zvYGcmcoYDAagWiruLOWGg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Murton Liu , Krunoslav Kovac , Bhawanpreet Lakha , Alex Deucher , Sasha Levin Subject: [PATCH 4.20 049/352] drm/amd/display: fix gamma not being applied correctly Date: Mon, 11 Feb 2019 15:14:36 +0100 Message-Id: <20190211141849.375284545@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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