From patchwork Mon Sep 25 19:49:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Melissa Wen X-Patchwork-Id: 13398341 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A1D7CD54BF for ; Mon, 25 Sep 2023 19:49:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 110B410E2D7; Mon, 25 Sep 2023 19:49:44 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6EF5910E2D7; Mon, 25 Sep 2023 19:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version: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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=RJM4rj3n58BT8xeDaQpf6JR9+X09MLaXC8SSvjcE8Yg=; b=SpRazkXSG4ilEVAn+ZtZguh0/K 61EBBqd0xbP5jd8up11xrI4uJ4org99G1g/7CFfff2+pA+aEd7zyqHFSLs0H+0csMkAY4y2/N3L/e z6kbBhq6OetER72PhFsSYJ75KlgR9nf5kWvctHbCsuLAvHtgaS1iynLnmP9hD4iCyAJp7ef1KlEr8 mq6xv24ZLT0G+lTfEpkSA3mOPeV/eKVXSVZtdVU3jLEU9Cr2TBJi0iFxi+nNlCkG3caJ74LB+rV8g fb6JoNmrO9oo0hBvHj+MgZKlm0x453P204lvQEvBJnCE3a1LCas9+zFwqqoILxDDo2Fmeq7bgWkTE zY0sV93A==; Received: from [102.213.205.115] (helo=killbill.home) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qkraJ-008GsG-UJ; Mon, 25 Sep 2023 21:49:36 +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, airlied@gmail.com, brian.starkey@arm.com, christian.koenig@amd.com, daniel@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, Xinhui.Pan@amd.com Subject: [PATCH v3 00/32] drm/amd/display: add AMD driver-specific properties for color mgmt Date: Mon, 25 Sep 2023 18:49:00 -0100 Message-Id: <20230925194932.1329483-1-mwen@igalia.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sebastian Wick , Pekka Paalanen , Shashank Sharma , Alex Hung , Xaver Hugl , kernel-dev@igalia.com, Nicholas Kazlauskas , Joshua Ashton , sungjoon.kim@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, This series extends the current KMS color management API with AMD driver-specific properties to enhance the color management support on AMD Steam Deck. The key additions to the color pipeline include: - plane degamma LUT and pre-defined TF; - plane HDR multiplier; - plane CTM 3x4; - plane shaper LUT and pre-defined TF; - plane 3D LUT; - plane blend LUT and pre-defined TF; - CRTC gamma pre-defined TF; You can find the AMD HW color capabilities documented here: https://dri.freedesktop.org/docs/drm/gpu/amdgpu/display/display-manager.html#color-management-properties The userspace case is Gamescope[1], the compositor for SteamOS. Gamescope has already adopted AMD driver-specific properties to implement comprehensive color management support, including gamut mapping, HDR rendering, SDR on HDR, HDR on SDR. Using these features in the SteamOS 3.5[2] users can expect a significantly enhanced visual experience. You can find a brief overview of the Steam Deck color pipeline here: https://github.com/ValveSoftware/gamescope/blob/master/src/docs/Steam%20Deck%20Display%20Pipeline.png Changes from: [RFC] https://lore.kernel.org/dri-devel/20230423141051.702990-1-mwen@igalia.com - Remove KConfig and guard properties with `AMD_PRIVATE_COLOR`; - Remove properties for post-blending/CRTC shaper TF+LUT and 3D LUT; - Use color caps to improve the support of pre-defined curve; [V1] https://lore.kernel.org/dri-devel/20230523221520.3115570-1-mwen@igalia.com - Replace DRM_ by AMDGPU_ prefix for transfer function (TF) enum; - Explicitly define EOTFs and inverse EOTFs and set props accordingly; - Document pre-defined transfer functions; - Remove HLG transfer function from supported TFs; - Remove misleading comments; - Remove post-blending shaper TF+LUT and 3D LUT support; - Move driver-specific property operations from amdgpu_display.c to amdgpu_dm_color.c; - Reset planes if any color props change; - Add plane CTM 3x4 support; - Removed two DC fixes already applied upstream; [V2] https://lore.kernel.org/dri-devel/20230810160314.48225-1-mwen@igalia.com - Many documentation fixes: BT.709 OETF, description of sRGB and pure power functions, TF+1D LUT behavior; - Rename CTM2 to CTM 3x4 and fix misleading comment about DC gamut remap; - Squash `Linear` and `Unity` TF in `Identity`; - Remove the `MPC gamut remap` patch already applied upstream[3]; - Remove outdated delta segmentation fix; - Nits/small fixes; It's worth noting that driver-specific properties are guarded by `AMD_PRIVATE_COLOR`. So, finally, this is the color management API when driver-specific properties are enabled: +----------------------+ | PLANE | | | | +----------------+ | | | AMD Degamma | | | | | | | | EOTF | 1D LUT | | | +--------+-------+ | | | | | +--------v-------+ | | | AMD HDR | | | | Multiply | | | +--------+-------+ | | | | | +--------v-------+ | | | AMD CTM (3x4) | | | +--------+-------+ | | | | | +--------v-------+ | | | AMD Shaper | | | | | | | | inv_EOTF | | | | | Custom 1D LUT | | | +--------+-------+ | | | | | +--------v-------+ | | | AMD 3D LUT | | | | 17^3/12-bit | | | +--------+-------+ | | | | | +--------v-------+ | | | AMD Blend | | | | | | | | EOTF | 1D LUT | | | +--------+-------+ | | | | ++----------v---------++ || Blending || ++----------+---------++ | CRTC | | | | | | +-------v-------+ | | | DRM Degamma | | | | | | | | Custom 1D LUT | | | +-------+-------+ | | | | | +-------v-------+ | | | DRM CTM (3x3) | | | +-------+-------+ | | | | | +-------v-------+ | | | DRM Gamma | | | | | | | | Custom 1D LUT | | | +---------------+ | | | *AMD Gamma | | | | inv_EOTF | | | +---------------+ | | | +----------------------+ Please, let us know your thoughts. Best Regards, Melissa Wen [1] https://github.com/ValveSoftware/gamescope [2] https://store.steampowered.com/news/app/1675200/view/3686804163591367815 [3] https://lore.kernel.org/dri-devel/20230721132431.692158-1-mwen@igalia.com Joshua Ashton (14): drm/amd/display: add plane degamma TF driver-specific property drm/amd/display: add plane HDR multiplier driver-specific property drm/amd/display: add plane blend LUT and TF driver-specific properties drm/amd/display: add CRTC gamma TF support drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func drm/amd/display: mark plane as needing reset if color props change drm/amd/display: add plane degamma TF and LUT support drm/amd/display: add dc_fixpt_from_s3132 helper drm/amd/display: add HDR multiplier support drm/amd/display: handle empty LUTs in __set_input_tf drm/amd/display: add plane blend LUT and TF support drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG drm/amd/display: copy 3D LUT settings from crtc state to stream_update drm/amd/display: Add 3x4 CTM support for plane CTM Melissa Wen (18): drm/drm_mode_object: increase max objects to accommodate new color props drm/drm_property: make replace_property_blob_from_id a DRM helper drm/drm_plane: track color mgmt changes per plane drm/amd/display: add driver-specific property for plane degamma LUT drm/amd/display: explicitly define EOTF and inverse EOTF drm/amd/display: document AMDGPU pre-defined transfer functions drm/amd/display: add plane 3D LUT driver-specific properties drm/amd/display: add plane shaper LUT and TF driver-specific properties drm/amd/display: add CRTC gamma TF driver-specific property drm/amd/display: add comments to describe DM crtc color mgmt behavior drm/amd/display: encapsulate atomic regamma operation drm/amd/display: decouple steps for mapping CRTC degamma to DC plane drm/amd/display: reject atomic commit if setting both plane and CRTC degamma drm/amd/display: add plane shaper LUT support drm/amd/display: add plane shaper TF support drm/amd/display: add plane 3D LUT support drm/amd/display: add plane CTM driver-specific property drm/amd/display: add plane CTM support drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 89 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 34 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 105 +++ .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 795 ++++++++++++++++-- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 ++ .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 224 ++++- .../gpu/drm/amd/display/include/fixed31_32.h | 12 + drivers/gpu/drm/arm/malidp_crtc.c | 2 +- drivers/gpu/drm/drm_atomic.c | 1 + drivers/gpu/drm/drm_atomic_state_helper.c | 1 + drivers/gpu/drm/drm_atomic_uapi.c | 43 +- drivers/gpu/drm/drm_property.c | 49 ++ include/drm/drm_mode_object.h | 2 +- include/drm/drm_plane.h | 7 + include/drm/drm_property.h | 6 + include/uapi/drm/drm_mode.h | 8 + 16 files changed, 1342 insertions(+), 108 deletions(-)