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;
Message-ID: <5bbd49b6-ad09-607f-521d-96f9d8eb3b20@amd.com>
Date:   Mon, 8 May 2023 17:24:55 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.1
From:   Harry Wentland <harry.wentland@amd.com>
Subject: Re: [RFC PATCH 12/40] drm/amd/display: add plane HDR multiplier
 driver-private property
To:     Melissa Wen <mwen@igalia.com>, amd-gfx@lists.freedesktop.org,
        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>,
        linux-kernel@vger.kernel.org
References: <20230423141051.702990-1-mwen@igalia.com>
 <20230423141051.702990-13-mwen@igalia.com>
Content-Language: en-US
In-Reply-To: <20230423141051.702990-13-mwen@igalia.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RGlxdWpJdEcrVStCYzI2czI4eks4WUdSbFVuZm1YeUhhb2RVaGxhaW5DbE90?=
 =?utf-8?B?b0R2QzdPU1ZDMVl6eXVVQWVyOE15em9iTDFKUU5HOFJLaDJXbUgvS09DRm82?=
 =?utf-8?B?bC8yVGFaMDQzc09mR2FZc2UzRVErT3lNMEZKWkQ3Vnp3L3h2dmJ1WW0yZFI2?=
 =?utf-8?B?QlI1SnF5em40ZndUV0xwOUs3SmtQTTE3Y0VTTWd4Wmk2OVFHZTlFOW5uWUxa?=
 =?utf-8?B?blAxeDAveDkvdExUZURxcllHazZqaEN5S1AyempBTkVmbmkxcHZwU0hrOXph?=
 =?utf-8?B?WXJ2Qktyd21ET3BQSGdPVTFDRXdZdUJSSnM5MmY3QVU3RzUzWFhHMFRZbDF5?=
 =?utf-8?B?RmkxT1RoV2dWZXR6QkJJTnQ1UC8zdVg0QmluSW9DQnFlb3c2NGZDNUw2d2Yr?=
 =?utf-8?B?ZUxCZDF2Y1FZR2daOVVsTjZIdWEzb0xjZzdoaEJlVU5BUk1HUElSNW8zcGhZ?=
 =?utf-8?B?SUlKczM1N2ttRFphMjIyOXdzdFNTWm1xVUVLMDFJL1dwRGs5UnZ0SFc1dXhC?=
 =?utf-8?B?bUUxcEhlV0hwdUR4S0tFMElFTnFDbEd4cW9EcU9HZmVvNndnRWdHakhRaFNK?=
 =?utf-8?B?MVFWMTFxRTZYRE5jOWtyUVZ2L0lwY0xSUXFnWXJrWjFuaE5zV1Vib0d1cElP?=
 =?utf-8?B?Q2RscEs5MFBrMEE4L3E3QkJ3MFpFTzRNdHdjeW1vT3dzN0EreWMzSXZjT0VN?=
 =?utf-8?B?a0RONC83QWdQT3d3VEFiNGtWQ3NtWmcvOFp5QTFJTHVDaGgyR0sySnVOWTJ2?=
 =?utf-8?B?Qm9zbGZ1T1hDcVFrbm9YK0FuMnE3K2ZjRlAvVjlQcVNLR2l4NDAxM1IwVlM3?=
 =?utf-8?B?MnJybXpodUhieHJ3YVFpMXc4dFBrQVdnZ2RYMGRTb0tBWFhZTlZ2TzVXSDBk?=
 =?utf-8?B?OUczSVFQSklhVG1Mb1ZYa0xKdHNTblJzc2s2bHd5NHNFMXpBQ3NoR0cvcG1B?=
 =?utf-8?B?THQ4ay9TelFBa1FrMkY4dFB6Z1pETE1tMFl3UkhlL2FzRzlTdU9pczc3ZjNp?=
 =?utf-8?B?RTlMZGdCYzZicWVSaHcxd3VOQ241NHY3U3g5Ri9YRkFsUEoyK2tYOHNwbnBG?=
 =?utf-8?B?YWdNejMzWGZCMndhZVBBMnE5clZObERuOWFxVjJFNnQ4dnZDbFh3YzVKNmxx?=
 =?utf-8?B?alcyU3cwYk1nWTlKcUlJc0RoWm0vZkZ2enc2S1U4aWhZc0Nyd2xBVUlwMkR4?=
 =?utf-8?B?VEx3TGM2YktUZ29DL1J2RjhRb1RPMzFPQ0tENWdaUGhRMXVnWXF0TndCdTIv?=
 =?utf-8?B?WXplWXY0OFBGNU5TSmVqOVdtUC9yaFJKU3JCZmh4ZmR2c1oyZW14K3ErWnkr?=
 =?utf-8?B?a09yVVIvVGdUeEpNNDRzNldlSUNpWmhYNzBaRDlTc1lvc0tMYURoaDF0b0JE?=
 =?utf-8?B?c1dHSE93ZU52WlJHdGp4ZWhReWpWQUVHU2l6cDMrenJzeHF4aFdYbnp1b1JH?=
 =?utf-8?B?U1QxQjVZcGFNckRDV2dFWURSbnFkZXE2S3BrYmlyTkJVcVhKRmNNNDlidy9H?=
 =?utf-8?B?bmgyd2R5aTMrczZ5ZmgvNFhPeEx0R1Y2V0ZvK2FlNVFtYi93dFYwNmJLZndz?=
 =?utf-8?B?aHBYZnZuVVlVa3Z6TmpXcnlwZjZHaGhXZnRkOGRta2UycmdiT0dSS01ScHFp?=
 =?utf-8?B?SldQWDdRLzBjc292MHhVZm9vYUZDMXRLWCtCYWdxTnFXdHYxYnNHaWJRdjZ2?=
 =?utf-8?B?WGExclM5QzgzTUg5ZWJqanN1d0N4L2xWQ0VEVUxsTE5SU3Vnb0RZZkF2eWZ4?=
 =?utf-8?B?dDVEc2YzeHBOa21ReUhRT2c4UFdvai9OZXQ5aTNBNytOcTQyT0g3cFp3dmZC?=
 =?utf-8?B?amZZZVIreXVSSGVteWdtakNIdEtJeGVTbEkvOVU0aG9tcE1lK1g5N1BFRWoz?=
 =?utf-8?B?VHdXZ1JmbVhUYTl4MDljSkNXVjA0UDlXSGVQc2tBK3dRVGJDenRYWDRPMUpV?=
 =?utf-8?B?UGhIRUVBYXBMdlhaazdHZUdOMVZScEgxTEZBR1p5TG84VVFzM25mLzlyWHcz?=
 =?utf-8?B?dVB6cTJtWFhBbG55VDMycE01VUdhYnZuQU81Ny9YdTBSVnVRYkNsc1YzUXZJ?=
 =?utf-8?B?Mnltc1FMNU10Z1FVTllzYlV0WHJRSXgxU1NIWm5Bc01YS1dkdkVWNndoUW82?=
 =?utf-8?Q?9LrZu8gd3v5aimcX0BJACdBhO?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e2389ca5-10ff-4947-eb82-08db500aadbc
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 21:24:59.9992
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YTqd+Nd3WYmmYqPPKfofpKUSEQ1qbD++SgAAlRlUpGZxDUI+YNFYcTta4TL4J9Pj6oUOeUFjb091DNIgwjZyeQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5269
X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        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


On 4/23/23 10:10, Melissa Wen wrote:
> From: Joshua Ashton <joshua@froggi.es>
> 
> Multiplier to 'gain' the plane. When PQ is decoded using the fixed func
> transfer function to the internal FP16 fb, 1.0 -> 80 nits (on AMD at
> least) When sRGB is decoded, 1.0 -> 1.0.  Therefore, 1.0 multiplier = 80
> nits for SDR content. So if you want, 203 nits for SDR content, pass in
> (203.0 / 80.0).
> 

Is gamescope intending to use this?

Harry

> Co-developed-by: Melissa Wen <mwen@igalia.com>
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> Signed-off-by: Joshua Ashton <joshua@froggi.es>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_display.c   |  6 +++++
>  drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h      |  4 +++
>  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 +++++++++
>  .../amd/display/amdgpu_dm/amdgpu_dm_plane.c   | 25 ++++++++++++++-----
>  4 files changed, 41 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index 24595906dab1..dd658f162f6f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -1326,6 +1326,12 @@ amdgpu_display_create_color_properties(struct amdgpu_device *adev)
>  		return -ENOMEM;
>  	adev->mode_info.plane_degamma_tf_property = prop;
>  
> +	prop = drm_property_create_range(adev_to_drm(adev),
> +					 0, "AMD_PLANE_HDR_MULT", 0, UINT_MAX);
> +	if (!prop)
> +		return -ENOMEM;
> +	adev->mode_info.plane_hdr_mult_property = prop;
> +
>  	return 0;
>  }
>  #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index ab9ce6f26c90..65a9d62ffbe4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -387,6 +387,10 @@ struct amdgpu_mode_info {
>  	 * linearize content with or without LUT.
>  	 */
>  	struct drm_property *plane_degamma_tf_property;
> +	/**
> +	 * @plane_hdr_mult_property:
> +	 */
> +	struct drm_property *plane_hdr_mult_property;
>  #endif
>  };
>  
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> index 005632c1c9ec..bb7307b9cfd5 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> @@ -51,6 +51,7 @@
>  
>  #define AMDGPU_DMUB_NOTIFICATION_MAX 5
>  
> +#define AMDGPU_HDR_MULT_DEFAULT (0x100000000LL)
>  /*
>  #include "include/amdgpu_dal_power_if.h"
>  #include "amdgpu_dm_irq.h"
> @@ -736,6 +737,17 @@ struct dm_plane_state {
>  	 * linearize.
>  	 */
>  	enum drm_transfer_function degamma_tf;
> +	/**
> +	 * @hdr_mult:
> +	 *
> +	 * Multiplier to 'gain' the plane.  When PQ is decoded using the fixed
> +	 * func transfer function to the internal FP16 fb, 1.0 -> 80 nits (on
> +	 * AMD at least). When sRGB is decoded, 1.0 -> 1.0, obviously.
> +	 * Therefore, 1.0 multiplier = 80 nits for SDR content.  So if you
> +	 * want, 203 nits for SDR content, pass in (203.0 / 80.0).  Format is
> +	 * S31.32 sign-magnitude.
> +	 */
> +	__u64 hdr_mult;
>  #endif
>  };
>  
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> index 5b458cc0781c..57169dae8b3d 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> @@ -1321,8 +1321,10 @@ static void dm_drm_plane_reset(struct drm_plane *plane)
>  		__drm_atomic_helper_plane_reset(plane, &amdgpu_state->base);
>  
>  #ifdef CONFIG_STEAM_DECK
> -	if (amdgpu_state)
> +	if (amdgpu_state) {
>  		amdgpu_state->degamma_tf = DRM_TRANSFER_FUNCTION_DEFAULT;
> +		amdgpu_state->hdr_mult = AMDGPU_HDR_MULT_DEFAULT;
> +	}
>  #endif
>  }
>  
> @@ -1424,11 +1426,11 @@ static void dm_drm_plane_destroy_state(struct drm_plane *plane,
>  #ifdef CONFIG_STEAM_DECK
>  int
>  amdgpu_dm_replace_property_blob_from_id(struct drm_device *dev,
> -					       struct drm_property_blob **blob,
> -					       uint64_t blob_id,
> -					       ssize_t expected_size,
> -					       ssize_t expected_elem_size,
> -					       bool *replaced)
> +					struct drm_property_blob **blob,
> +					uint64_t blob_id,
> +					ssize_t expected_size,
> +					ssize_t expected_elem_size,
> +					bool *replaced)
>  {
>  	struct drm_property_blob *new_blob = NULL;
>  
> @@ -1482,6 +1484,10 @@ dm_plane_attach_color_mgmt_properties(struct amdgpu_display_manager *dm,
>  					   dm->adev->mode_info.plane_degamma_tf_property,
>  					   DRM_TRANSFER_FUNCTION_DEFAULT);
>  	}
> +	/* HDR MULT is always available */
> +	drm_object_attach_property(&plane->base,
> +				   dm->adev->mode_info.plane_hdr_mult_property,
> +				   AMDGPU_HDR_MULT_DEFAULT);
>  }
>  
>  static int
> @@ -1507,6 +1513,11 @@ dm_atomic_plane_set_property(struct drm_plane *plane,
>  			dm_plane_state->degamma_tf = val;
>  			dm_plane_state->base.color_mgmt_changed = 1;
>  		}
> +	} else if (property == adev->mode_info.plane_hdr_mult_property) {
> +		if (dm_plane_state->hdr_mult != val) {
> +			dm_plane_state->hdr_mult = val;
> +			dm_plane_state->base.color_mgmt_changed = 1;
> +		}
>  	} else {
>  		drm_dbg_atomic(plane->dev,
>  			       "[PLANE:%d:%s] unknown property [PROP:%d:%s]]\n",
> @@ -1533,6 +1544,8 @@ dm_atomic_plane_get_property(struct drm_plane *plane,
>  			dm_plane_state->degamma_lut->base.id : 0;
>  	} else if (property == adev->mode_info.plane_degamma_tf_property) {
>  		*val = dm_plane_state->degamma_tf;
> +	} else if (property == adev->mode_info.plane_hdr_mult_property) {
> +		*val = dm_plane_state->hdr_mult;
>  	} else {
>  		return -EINVAL;
>  	}