From patchwork Thu Aug 10 16:03:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Melissa Wen X-Patchwork-Id: 134089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp536572vqi; Thu, 10 Aug 2023 09:27:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8LVyZeXIaHeIKfsEOPaNwfY3ddrPyyb2sTFft/9yLyrTEsCB5HSRq3Xa0qJEcfSn/cz8g X-Received: by 2002:a05:6a20:dda6:b0:12f:bb22:ad3b with SMTP id kw38-20020a056a20dda600b0012fbb22ad3bmr2254273pzb.62.1691684839536; Thu, 10 Aug 2023 09:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691684839; cv=none; d=google.com; s=arc-20160816; b=l1U+pVh0NfkTJ9lkO19gQ9v/qBfIj2uFA8Bbhpw+WXTuDJiRl/hI1/ChLMb4aX3qwx zPBbYUd53Z3kqWuWiD/Cj+5fte00NMnI3aC+drblOdY591y8guvsSteT8DV6280zXjtO GNBdk5bv0dWmg7R/mC8B/Ihap41rDsSPeMcHsylIDJsF9NbZ/dSsRT8bpUc7VkTIyyKh OohLyuEjr7B9cV+5ycIlq49JjdIiRQt9k00OLzJZ7nv2u/GN6XZameXisi7SwYe/M81r 75Zf1k/ZZhsb1gBGpfaQjuTmLMKqtTdpG51ej54esUVlvNUJ1mSstMPntThZP1KR7YKU RypQ== 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=1iMFHMugd7iTv6dIKtnvC4qTAO4PL6Pl+JouqLpfp8o=; fh=K4g2hpcHeis9i+u86e9V+yTBU0PZFkfdrKenkMdV+qw=; b=CdpB9zXVQy4UhQ7zWGITaLNm7Lp9K7aTs1sDlLiE+2oj13WK5EFQhBhGFFoVDzQ2UC ywYqyCwqPzyX79QVY4A7SKhcAPfGfVNsPACDtEDz8awfgLNLSuuoOSuoSjB10NMNkN8H JTSoNrxpcdld5M8eroF3Y0WqoRF/gfqnpq+FPaMX7VQ0w4yxU0nroMZFaNJc9FQ7RcTH ulGvOnoNvO+Pq9VhLXUYr4XjPF84A/VGkIP6izeQkyMvQnGWe62SKE7khn2xBFGqz3z+ TWt9iE3WDKujfFjhQ+pa2iCJNtAzAb4gWAQgH+tBB3xpZSVHRyx+Lu0HPiSXgEhQX+Qv MtIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=RrTQeZB2; 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 x189-20020a6386c6000000b00563fbc0000asi1829511pgd.18.2023.08.10.09.27.06; Thu, 10 Aug 2023 09:27:19 -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=RrTQeZB2; 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 S236515AbjHJQGs (ORCPT + 99 others); Thu, 10 Aug 2023 12:06:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236535AbjHJQGG (ORCPT ); Thu, 10 Aug 2023 12:06:06 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58BE1420C for ; Thu, 10 Aug 2023 09:04:42 -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=1iMFHMugd7iTv6dIKtnvC4qTAO4PL6Pl+JouqLpfp8o=; b=RrTQeZB2ay0bNxhF1dsum4jsUU U06coAnkieWsjRjmgtgHHW87DGUscPIgZllHEhSvYc0NY/hBVabvPbeqxnlYzS9fH45W1+VTdSStA nXv7s+xWjK/D/R5acXk6fuze3/raI5XM1Q3wShj6TufzaeSA3Gw8biqRiDRlqbdnl1s4I77drhwFM 1fBiK4lMZGao9JY/RZ9pWTX1VZbi89ghV7DncQv3gfDci5FSLt1tMaqbSUprQSQzE50yhN/6na0Fm tcWayAL7JXVh7WmXW4V127fRzlzWBn/TPjPSx1xI97VygmPS4lkV09bg1JbTPf0U3/eJVy0BW72Zd 5qNAZxjw==; Received: from [38.44.68.151] (helo=killbill.home) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qU899-00GjYD-2Y; Thu, 10 Aug 2023 18:04:23 +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 , Pekka Paalanen , Simon Ser , kernel-dev@igalia.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 30/34] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Date: Thu, 10 Aug 2023 15:03:10 -0100 Message-Id: <20230810160314.48225-31-mwen@igalia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230810160314.48225-1-mwen@igalia.com> References: <20230810160314.48225-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,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1773860122684082983 X-GMAIL-MSGID: 1773860122684082983 From: Joshua Ashton When commiting planes, we copy color mgmt resources to the stream state. Do the same for shaper and 3D LUTs. Reviewed-by: Harry Wentland Signed-off-by: Joshua Ashton Co-developed-by: Melissa Wen Signed-off-by: Melissa Wen --- 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 d37269a2179e..dfe61c5ed49e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8274,6 +8274,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;