Received: by 2002:a05:6358:51dd:b0:131:369:b2a3 with SMTP id 29csp1317436rwl; Thu, 10 Aug 2023 09:22:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpdpcQbmbpOCGHrljIkygUBCm0jvKYJgAewCvOPdn8goov4gdBTilbtJVMd7WtK2V6RL7Q X-Received: by 2002:a17:906:1011:b0:99b:de7b:7d2a with SMTP id 17-20020a170906101100b0099bde7b7d2amr2535254ejm.67.1691684525188; Thu, 10 Aug 2023 09:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691684525; cv=none; d=google.com; s=arc-20160816; b=UlCW3JA5OJqX8ClQQtI3NFxMBJb8wtFrWcw5Z5pqbE3d5Sh5gu+D5NSeAmjJjYglcD 9wdMSnZhiHun86vvXWH3KLRsQJsqzvvbd6onBRueNCYrWDvHd8IF0M+v3rpajbM2MeVK z3JsGXDHtzQwK45aivj8JtCjsVlFjkyJ1m3uRlv+0LGcRN3XK4pQ11n2CuqiBLP98xC5 FeBNx1BNP7wZGOWdcO/oKy11zC/XYMP7PYvgeia5A8NOI/KemydgpSb0f21jsp/WxSoI sbwTn3WTDO8t3GCJSWB64QAWcmFOeH0fL7HxjKr6GjXx1vWsAM7MKc1U5teAtBOzWQIP VfFw== 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=yihuxHBV+g9axyR/xTXUOWNxZvnA2KOoauyFvn8HnIA=; fh=K4g2hpcHeis9i+u86e9V+yTBU0PZFkfdrKenkMdV+qw=; b=Wv1IlH3/Fmfo4pDvSDPTndihK9xuu6xHLLkNFmVsWafB94fL1qB3SJa1iAH/tuq8q6 4Z6pRgR8ul+8Mq9JpXPRy2jYeFj90JBR6Zl5ftDQbtgdMxaC+bnpt3F0eVXmpPmzSm7B 177lKRm3WzOn54isCymENTgo84h+UkI4UiTJy2iyZWeRoasjBjULPKG0EVzkh0Ms2bYy MdJ2kH6hiWugHjIo32LhJ1JuTsSTAeDAkpOEFADSP+tHJAKHt4hNoBd3xeuPcoYjKUlz bfkVpw81qysmlqHZtqx02Sv8ovRox+7VGIfdPK9zL5ji9Jlx9FGalj2y2tVuBeajbWeO EKwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=degDQUXN; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c16-20020a170906925000b009886d385534si1895619ejx.950.2023.08.10.09.21.20; Thu, 10 Aug 2023 09:22:05 -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=degDQUXN; 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 S236532AbjHJQGC (ORCPT + 99 others); Thu, 10 Aug 2023 12:06:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235592AbjHJQFP (ORCPT ); Thu, 10 Aug 2023 12:05:15 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C0083AA4 for ; Thu, 10 Aug 2023 09:04:25 -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=yihuxHBV+g9axyR/xTXUOWNxZvnA2KOoauyFvn8HnIA=; b=degDQUXNrS27ScPHvVWrEef+Ka 8oWWI2o/Uc3YGBnnp4oHfbfiwXFHBWsOAxWg47+4xLg5HLnaIDz5S2ivaIuAwmRLMHeMgclnwVQPm l/AXvQhfRMOCZhvqvREYRH/Vl4FAYHWrJgYC6bhFys4Ud2p394CQXZ3KVnXU9wz1ODYUUoDeWdT5S F0EE00hnqiWo1wbOHIS2cSePvSFJvOAvEAWrCa/kd6PAIAk/0olJWtFzef5BthHj5cq0Dq84I+a1H EwAPg/PGGfrODAdBsFkUarJjU0SnGDMN3RB0+42ElSmZ3so7PFkeMS7VaDRdpeZvvH0y1uj6sj/8w Ic5mRptA==; 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 1qU892-00GjYD-JE; Thu, 10 Aug 2023 18:04:16 +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 27/34] drm/amd/display: handle empty LUTs in __set_input_tf Date: Thu, 10 Aug 2023 15:03:07 -0100 Message-Id: <20230810160314.48225-28-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 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,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 From: Joshua Ashton Unlike degamma, blend gamma doesn't support hardcoded curve (predefined/ROM), but we can use AMD color module to fill blend gamma parameters when we have non-linear plane gamma TF without plane gamma LUT. The regular degamma path doesn't hit this. Reviewed-by: Harry Wentland Signed-off-by: Joshua Ashton Signed-off-by: Melissa Wen --- .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c index 58c4797f506e..2c96501d2fc0 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c @@ -551,17 +551,21 @@ static int __set_input_tf(struct dc_transfer_func *func, struct dc_gamma *gamma = NULL; bool res; - gamma = dc_create_gamma(); - if (!gamma) - return -ENOMEM; + if (lut_size) { + gamma = dc_create_gamma(); + if (!gamma) + return -ENOMEM; - gamma->type = GAMMA_CUSTOM; - gamma->num_entries = lut_size; + gamma->type = GAMMA_CUSTOM; + gamma->num_entries = lut_size; - __drm_lut_to_dc_gamma(lut, gamma, false); + __drm_lut_to_dc_gamma(lut, gamma, false); + } - res = mod_color_calculate_degamma_params(NULL, func, gamma, true); - dc_gamma_release(&gamma); + res = mod_color_calculate_degamma_params(NULL, func, gamma, gamma != NULL); + + if (gamma) + dc_gamma_release(&gamma); return res ? 0 : -ENOMEM; } -- 2.40.1