| Message ID | 20230423141051.702990-22-mwen@igalia.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2224599vqo;
Sun, 23 Apr 2023 07:31:48 -0700 (PDT)
X-Google-Smtp-Source:
AKy350apmPHWoPM6xJbGksPlAjQp1LOuzPFUvyRPZFl0uMuGwr8Ur9NCybauMjyawsnEXi1espSs
X-Received: by 2002:a05:6a00:1582:b0:63d:4142:1a1b with SMTP id
u2-20020a056a00158200b0063d41421a1bmr16008569pfk.18.1682260308486;
Sun, 23 Apr 2023 07:31:48 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1682260308; cv=none;
d=google.com; s=arc-20160816;
b=w3Lt1/TNn+JUpW1Qeu++aYMLDgqOAwEA9a8x2M7xuGhg5sJK5fyxGJ4Hdhx+vwiqH0
y2ltBIqmIXBekN5jPSRLrKqfO/q5l3V24EbUHtEAX6RCZrI6uHhZWOrf8U5zlb8ozvS9
iFT0Q7IJ2Stn6wbNZQpThSnlBw/uC9HXRs6x4CWpCVJjv70/D8w6EAMk/fKfoUHeYvrf
Uv4yL0aE08i/4wym2sRet/qJ2Gy5XkCwTxGQd0fAF+KpV2JQ5ooUhhcvGlsyL2FnD+mr
4qL6F0chaP4jmWkSRIOQlb7zbEKyQM7Aa12hQAFwHe32D1KIaiecMdXqI5USYfQMA2f8
+PTg==
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=1pDv9ml0fMW1552wzaK0WkxguQ7efaI2g4W2c2iLaSQ=;
b=URJpIgKKY2x3rsnXORYbB4VQE+cMGBNKT4wPcmUZiqBUcksN2cErAWEsK35q3+hP8i
gD0uZurUg0X0QWZAdI1tHZin8ut6RXLdW6P//pyezJm4Q0kpD/ZiFdT3mwV3H+PpOo50
y+3WhI9EByMiCw/hFjNDLARk93oQF/VuBcuifPTmFyA428EeX/Issofav6cnp+HQguTa
ndb1lxVve/0/WxUf2zwVreSnG7jJQAdwh++NfBRB0ITYYzA7waaOuORSYkptHjmBF8fL
nXJIKN+alwO8Rk8RZUaR2HE9qtB0ljjzj/PdkQ2qx3Ag9+88dNoKgKB3KAU1fq8Cv7NX
VIIQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=fail header.i=@igalia.com header.s=20170329 header.b=Eox+XIAf;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
k27-20020a63561b000000b0051b52bacc82si8549729pgb.243.2023.04.23.07.31.33;
Sun, 23 Apr 2023 07:31:48 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=fail header.i=@igalia.com header.s=20170329 header.b=Eox+XIAf;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230347AbjDWOPe (ORCPT <rfc822;fengqi706@gmail.com> + 99 others);
Sun, 23 Apr 2023 10:15:34 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34136 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230358AbjDWOPY (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 23 Apr 2023 10:15:24 -0400
Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78996273A
for <linux-kernel@vger.kernel.org>;
Sun, 23 Apr 2023 07:14:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com;
s=20170329;
h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:
Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:
Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe:
List-Post:List-Owner:List-Archive;
bh=1pDv9ml0fMW1552wzaK0WkxguQ7efaI2g4W2c2iLaSQ=;
b=Eox+XIAfqqBlMEmXETYlxVXbEh
JHMNZPiMHotm9iHBFLCgTg0eMle01wIqFJm4RqTCF4aAo33wH93VNrc75eNg9GhToaQQ8MZR10sVS
VVcU/Ad/u2MW3uASchmgY0rh/ZmfaZ2M0uPRWalgkOBjLFHWxJtajKLCq7TTFWO3KxZiHb/hsg7vB
lm7esmn/xAWZc5vjeCb7V5QRcsbOCl8FLRoDuqvkvkMTTq9sRIXEff+iMavZKHEIa39gNBNpgOTDG
0V1X62DnqJA3REts/k7ijvTFdNinuGn+fMbGrnxYflTLiqHR+qSut+0U8lXTcgUikMRUGJoXot13l
iqFJGnhw==;
Received: from nat-wifi.fi.muni.cz ([147.251.43.9] helo=killbill.fi.muni.cz)
by fanzine2.igalia.com with esmtpsa
(Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)
(Exim)
id 1pqaSf-00ANVs-T7; Sun, 23 Apr 2023 16:13:06 +0200
From: Melissa Wen <mwen@igalia.com>
To: amd-gfx@lists.freedesktop.org,
Harry Wentland <harry.wentland@amd.com>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
sunpeng.li@amd.com, Alex Deucher <alexander.deucher@amd.com>,
dri-devel@lists.freedesktop.org, christian.koenig@amd.com,
Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch
Cc: Joshua Ashton <joshua@froggi.es>,
Sebastian Wick <sebastian.wick@redhat.com>,
Xaver Hugl <xaver.hugl@gmail.com>,
Shashank Sharma <Shashank.Sharma@amd.com>,
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
sungjoon.kim@amd.com, Alex Hung <alex.hung@amd.com>,
Melissa Wen <mwen@igalia.com>, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 21/40] drm/amd/display: allow BYPASS 3D LUT but keep
shaper LUT settings
Date: Sun, 23 Apr 2023 13:10:33 -0100
Message-Id: <20230423141051.702990-22-mwen@igalia.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230423141051.702990-1-mwen@igalia.com>
References: <20230423141051.702990-1-mwen@igalia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,
T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763977784956762175?=
X-GMAIL-MSGID: =?utf-8?q?1763977784956762175?=
|
| Series |
drm/amd/display: add AMD driver-specific properties for color mgmt
|
|
Commit Message
Melissa Wen
April 23, 2023, 2:10 p.m. UTC
HW allows us to program shaper LUT without 3D LUT settings and it is
also good for testing shaper LUT behavior, therefore, DC driver should
allow acquiring both 3D and shaper LUT, but programing shaper LUT
without 3D LUT (not initialized).
Signed-off-by: Melissa Wen <mwen@igalia.com>
---
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c index 3303c9aae068..bacb0a001d68 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c @@ -113,7 +113,6 @@ static bool dcn30_set_mpc_shaper_3dlut(struct pipe_ctx *pipe_ctx, } if (stream->lut3d_func && - stream->lut3d_func->state.bits.initialized == 1 && stream->lut3d_func->state.bits.rmu_idx_valid == 1) { if (stream->lut3d_func->state.bits.rmu_mux_num == 0) mpcc_id_projected = stream->lut3d_func->state.bits.mpc_rmu0_mux; @@ -131,8 +130,12 @@ static bool dcn30_set_mpc_shaper_3dlut(struct pipe_ctx *pipe_ctx, if (acquired_rmu != stream->lut3d_func->state.bits.rmu_mux_num) BREAK_TO_DEBUGGER(); - result = mpc->funcs->program_3dlut(mpc, &stream->lut3d_func->lut_3d, - stream->lut3d_func->state.bits.rmu_mux_num); + if (stream->lut3d_func->state.bits.initialized == 1) + result = mpc->funcs->program_3dlut(mpc, &stream->lut3d_func->lut_3d, + stream->lut3d_func->state.bits.rmu_mux_num); + else + result = mpc->funcs->program_3dlut(mpc, NULL, + stream->lut3d_func->state.bits.rmu_mux_num); result = mpc->funcs->program_shaper(mpc, shaper_lut, stream->lut3d_func->state.bits.rmu_mux_num); } else {