From patchwork Sun Apr 23 14:10:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Melissa Wen X-Patchwork-Id: 86741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2223069vqo; Sun, 23 Apr 2023 07:28:41 -0700 (PDT) X-Google-Smtp-Source: AKy350b5vDyVDYsIKIjPqOO7OoLZPv4aGTnlXFB9R/rgOirwMN11dTrl2Ic+sTeGBwmhFwPdx/Om X-Received: by 2002:a05:6a20:4394:b0:f0:2501:349b with SMTP id i20-20020a056a20439400b000f02501349bmr13379487pzl.25.1682260121386; Sun, 23 Apr 2023 07:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682260121; cv=none; d=google.com; s=arc-20160816; b=iIICSkKitmWCQ9mjS3+KmvWFniPL55Equ8JtQpqsULWPybrDRtF31qonR3w9IUtGkf hwpgVn+WAswGtGIQu/GKCxSEGTdUGUDfzvVAaki393NP0s9S0GumuEOaVNZh+yNEuSbi xE2Tgx4GIlUCaSrZzoX+okuf/LXcvH3T6JrxBPws0yo2M0iKbSrSs0W561UUegi8p2// Af6RyeinFek6mMk4U8jaMid25XuJTiooX6bTTmDwka4vnXwX/5A2XBN3Oxz5ZjdHwlEQ DxLbFAGpCF6UcBuG8LDUL6kRgF9VlZ3yGfAUiomGHHr/BDksT/fUo2LB76EiXP0rMyKu oH+Q== 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=3ClD7dV5VuRi0yBxsEkJ52hVcmkeVavwfEKm0GzWXV0=; b=CoDwixcS9KTQf/tSs+od5qJZQq2RAarw/XmIY35xjZeXp9r+tmJUjjEBTGfuTQ+M4o CBKp5c5z6NuIscEOqrlLAPvg7dF9XS1tuYlvqot7vhDnuOA0PG3+VH9jA/gP35SVTy58 8zkWM4YYDPzwfKW2acaMRtxz/yIWsawzXsoxAd/SRc4cKENL26hgm/PcrsUz5zPw9Rbt YyOumJWVo9mhTmxk2CebqqkvOMs3BLype0wqfXOclHyMTwJAf8eBD5q+fFss2T/E0v8Z 1hOKUQF771mpVgIS9Z2f4aYSyg+Ch1mWTsuNpecRf6W3V1OfQhRovDA3qHX4P7CkLEVI 27fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=Mscy7EO0; 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 u15-20020a63470f000000b005143d5f9ff0si8795553pga.357.2023.04.23.07.28.27; Sun, 23 Apr 2023 07:28:41 -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=Mscy7EO0; 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 S230315AbjDWOOo (ORCPT + 99 others); Sun, 23 Apr 2023 10:14:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbjDWOOh (ORCPT ); Sun, 23 Apr 2023 10:14:37 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D70C530F5 for ; Sun, 23 Apr 2023 07:14:03 -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=3ClD7dV5VuRi0yBxsEkJ52hVcmkeVavwfEKm0GzWXV0=; b=Mscy7EO0gkStGjDQNcsCg5zVyN bq0TY2LHRPFrZ5GtBwNl/y2RthYAcEZ59rjOzdOUOUefA/FIqb5t2v7onqNismXpG1YPDQvFLxjiw T3Nc1vBouF+pTUlS2Fk5rHr0JVJRf0R0B5W0UVtbCv1Vj4qtKtDF9Q7F9AQbMxXM2EO4exvqtzK6M eDinz8eY/E9pc8Tu+09q4Vzb8yx2ZJ+JJR1ScWienqUfoAXo5r1u5XwQoQ6xF25b+W5oCt2UVP1b9 rJaHLeqPxbrkXXbdYvDUYNge1oyHQqOFnra1cnW5te9wf7+zQf0Xyo+5px76pAmT99ugIB37dbr6J /k+hqfYg==; 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 1pqaSd-00ANVs-8i; Sun, 23 Apr 2023 16:13:03 +0200 From: Melissa Wen To: amd-gfx@lists.freedesktop.org, Harry Wentland , Rodrigo Siqueira , sunpeng.li@amd.com, Alex Deucher , dri-devel@lists.freedesktop.org, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: Joshua Ashton , Sebastian Wick , Xaver Hugl , Shashank Sharma , Nicholas Kazlauskas , sungjoon.kim@amd.com, Alex Hung , Melissa Wen , linux-kernel@vger.kernel.org Subject: [RFC PATCH 20/40] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Date: Sun, 23 Apr 2023 13:10:32 -0100 Message-Id: <20230423141051.702990-21-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 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763977588995401700?= X-GMAIL-MSGID: =?utf-8?q?1763977588995401700?= From: Joshua Ashton When commiting planes, we copy color mgmt resources to the stream state. Do the same for shaper and 3D LUTs. Co-developed-by: Melissa Wen Signed-off-by: Melissa Wen Signed-off-by: Joshua Ashton --- 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 76a776fd8437..729e37fa1873 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8190,6 +8190,10 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, &acrtc_state->stream->csc_color_matrix; bundle->stream_update.out_transfer_func = acrtc_state->stream->out_transfer_func; + bundle->stream_update.lut3d_func = + (struct dc_3dlut *) acrtc_state->stream->lut3d_func; + bundle->stream_update.func_shaper = + (struct dc_transfer_func *) acrtc_state->stream->func_shaper; } acrtc_state->stream->abm_level = acrtc_state->abm_level;