Received-SPF: pass (google.com: domain of linux-kernel+bounces-50010-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <2c72f42e-2170-4cd3-b471-c079a754f9d1@amd.com>
Date: Fri, 2 Feb 2024 09:19:42 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 2/5] drm: Add drm_get_acpi_edid() helper
Content-Language: en-US
To: Jani Nikula <jani.nikula@linux.intel.com>, amd-gfx@lists.freedesktop.org,
 Alex Deucher <alexander.deucher@amd.com>,
 Harry Wentland <harry.wentland@amd.com>,
 "Rafael J . Wysocki" <rafael@kernel.org>, Hans de Goede <hdegoede@redhat.com>
Cc: "open list:ACPI" <linux-acpi@vger.kernel.org>,
 open list <linux-kernel@vger.kernel.org>,
 "open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
 Melissa Wen <mwen@igalia.com>, Mark Pearson <mpearson-lenovo@squebb.ca>
References: <20240201221119.42564-1-mario.limonciello@amd.com>
 <20240201221119.42564-3-mario.limonciello@amd.com> <878r43f9bd.fsf@intel.com>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <878r43f9bd.fsf@intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TlMycGl0eEZxN0h5ZDU3d2hGbTBjL1VkUGNjYkFaWUxYYXBTVDV0YTRNYU5O?=
 =?utf-8?B?TU1kbFk2Uys0WHhsMlVjeFIwTXprVUJ0QjIrVkFEVzRHY0FnYmRyVTNLbXRi?=
 =?utf-8?B?c3lIQ1BndHJBNkR6bEo3RktPRHlDOGRCdW9XZzZ6em04dldJTkJYbnVJK0dF?=
 =?utf-8?B?TTFhNVdBb1ZPM3QySDN4ZkhUSDNRSkxvcUJ0alpSblJrM1BXajhXZVRPeTUx?=
 =?utf-8?B?VjhQTW1iRGxTbnZKMTBoZUVEU2RyQ2R0c2lSSjhDL3ViMDh5SjZDaWRaQUt2?=
 =?utf-8?B?bnBxNVU3c2VzSklwK0dya2JKSEpqb2FqWE5KbXQxcmVIV1kvTUpsZmdYb0pm?=
 =?utf-8?B?YXN6T2hFVSt1THRLMUw1WDNJSUFUeG5iNTJkNkJJTXhzcTNzNzB6TnFZUFRv?=
 =?utf-8?B?SllnTS8rMjFJRklTaWNjOEJrZEVnOTJENHRYRmMwcDBHU2xoakdsNGgzSm1G?=
 =?utf-8?B?ZTl2SCsxNFJ2K2E0VEUvbndUR0UyTlBkNmxwYTNuRkFpb204dE9wWnJrZVlt?=
 =?utf-8?B?ZE1rY0pUdWNUK2xRNWJFY3F5ZENpTTRJS1NBL0c1U2lFeUgvTFp0bW1iRENs?=
 =?utf-8?B?VE9BV2w5ak9WcTZXZldVOFJLMzBoQmNnNEg5d3ZTQmZRdklyeEwzUGFlSGQ5?=
 =?utf-8?B?cFVpYlA4bzJTVDRWb3NSMjRkSGdoZW5WTEcvQnk1RTVQQVBEemErSExueW1H?=
 =?utf-8?B?UkQyVjV0dDdoU3lIcFFhaVhhT21Od0w3UTdDd0p3bTN4NmhZNm5qOE5hdmlq?=
 =?utf-8?B?ay81YSt4Nm1uQTg0Z3lmL1lHRlhjS2pVSkdVQVIrWm5HaHdqODZwN1RwL0g0?=
 =?utf-8?B?elNLdFE1MHppZkJpLy9EQ2pwSDFncTJhY083bWtzSG80ckcvaDEzc1FBSUJJ?=
 =?utf-8?B?WVZYN3MvZ0lwRmkxYVdoelF6QnJOYzZndlM1YndyVm82YURqUytUMTN2V0d4?=
 =?utf-8?B?WFBHSWNwUDl6Q1k1STF2UFEwWVNlYUQ1WkdsYUVwRjBnVWh0TmQ4eDJLd3hZ?=
 =?utf-8?B?dHRiSmFrUFR6V0V5d0VIT0VBRW9WVGJod2RQNVBXTWJ2WWpXMUQvdjJWaERF?=
 =?utf-8?B?NXBRVkdIdWQvVVdIUmpCTWU1SWE3dG10R0hkTEZZOXFyWis4WHZ2bHoyRDdu?=
 =?utf-8?B?N0V0YVJJMUN3S0Y4TEpWZWJtSU9hVGY4ZXJFelZtb1dTUXlTOGNVMFlaYWtq?=
 =?utf-8?B?aERYS3MwQzhEVVMvcm5wcnhiZ1d5YzdoaUZRRk9lVkxSOU5zK1d0YStITUVL?=
 =?utf-8?B?RHZXMGRVUDJSaGI1RUVtRUJhK212K0xON0toZDBvay9CNlNicEV4ODVLRytR?=
 =?utf-8?B?M0NyaUVyOGtQSXViY3dKWXphUDRZUG1ySHRON3Z2TEl0RmJwQ25VdFBSMnZL?=
 =?utf-8?B?T0tGRUdKY3lnWTB6TitwTXlLMTVmcUNFNXFsRkVCb2YyNEs3RWR4NkVqbEdP?=
 =?utf-8?B?b3VxVjFrcllPMndzSFhzb2NleVpHdGd0bUlWK2EwUHB6SlR3UkkzeXNtd2Mv?=
 =?utf-8?B?UHd6VVc0MzRDQnZmQk5XVGRuRXVwT3RrN0hFWWFoWFJsYjVIL1hTV0hiMlVM?=
 =?utf-8?B?aU84SkZsUFF3VXFkejlHTHBBeVlwYmkwL1VBanNBcUg5NUlQZEtRUUpIZkdy?=
 =?utf-8?B?aHJBYkkremdONXhOZEV6d2prRjFGc0psM0JyYk1kR0FmWFloSTVPbEJNcTBS?=
 =?utf-8?B?S0tLTVN4aE40ZWZwOTRjUExCVlBhRE1sL21qb3BzZ2xSTjdvTEZJQUFkeXpz?=
 =?utf-8?B?UHNHRjJqLzVZUlVqdXFSNDRCY1FWbGxuT0dnODc2KzdKQ3hkUU5STlhWcHIx?=
 =?utf-8?B?MGYwMGN1blV2UVE1aTZ5L2lXcklUV294QWlGRmhrVk52bFg5YjdZQi8wZjVO?=
 =?utf-8?B?N2E5MWp6MEkzVVpsK3l0aTBGZHF6UmRWZVhnSEFXa1VPejBqclNqR3JaaWU0?=
 =?utf-8?B?ZzN3cHlPM0p5QWg4eE9WTWx1S3RiZmNRa2d5RGlpSXoyVnRtUFBzSzV5ZURL?=
 =?utf-8?B?UDEzK1RGWE8xZnVyU090dGZOT0YyZEg3Wjk5dDZzNWNqenpDVTZXQnBVdGZi?=
 =?utf-8?B?YmVjNytyUXdrQ3lKV20xSHJzeFp2YVFWWktnSkQ1QWxKYTQ2MzhoQjlYY2pT?=
 =?utf-8?Q?avrFZUinuHli1WgmHyECYG+0d?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9429d2e9-c4f7-41cc-c1ca-08dc2402631a
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 15:19:45.2269
 (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: MwG3FiE6JzIIwjh/TRl55ugxEIo8xMrItdAta/xGuCrK6zL6VAF53gvePVQ++8mFBjDHaSTWmPMvPz32cE1FSg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7612

On 2/2/2024 04:29, Jani Nikula wrote:
> On Thu, 01 Feb 2024, Mario Limonciello <mario.limonciello@amd.com> wrote:
>> Some manufacturers have intentionally put an EDID that differs from
>> the EDID on the internal panel on laptops.  Drivers can call this
>> helper to attempt to fetch the EDID from the BIOS's ACPI _DDC method.
> 
> I'm really not happy about adding new struct edid based APIs to
> drm_edid.[ch]. Everything new should be struct drm_edid based. All
> drivers should be converting towards struct drm_edid, instead of adding
> more legacy to rip out later.

OK; I'll redo it with struct drm_edid.

The changeover for amdgpu to use drm_edid is going to be a pretty 
involved effort so I'm going to use a get_raw in amdgpu for now so we 
can unblock the issue this is fixing and let that part get removed when 
the rest of the overhaul gets done there.

> 
> BR,
> Jani.
> 
>>
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>> v1->v2:
>>   * Split code from previous amdgpu specific helper to generic drm helper.
>> v2->v3:
>>   * Add an extra select to fix a variety of randconfig errors found from
>>     LKP robot.
>> ---
>>   drivers/gpu/drm/Kconfig    |  5 +++
>>   drivers/gpu/drm/drm_edid.c | 73 ++++++++++++++++++++++++++++++++++++++
>>   include/drm/drm_edid.h     |  1 +
>>   3 files changed, 79 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>> index 2520db0b776e..14df907c96c8 100644
>> --- a/drivers/gpu/drm/Kconfig
>> +++ b/drivers/gpu/drm/Kconfig
>> @@ -21,6 +21,11 @@ menuconfig DRM
>>   	select KCMP
>>   	select VIDEO_CMDLINE
>>   	select VIDEO_NOMODESET
>> +	select ACPI_VIDEO if ACPI
>> +	select BACKLIGHT_CLASS_DEVICE if ACPI
>> +	select INPUT if ACPI
>> +	select X86_PLATFORM_DEVICES if ACPI && X86
>> +	select ACPI_WMI if ACPI && X86
>>   	help
>>   	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
>>   	  introduced in XFree86 4.0. If you say Y here, you need to select
>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>> index 69c68804023f..1fbbeaa664b2 100644
>> --- a/drivers/gpu/drm/drm_edid.c
>> +++ b/drivers/gpu/drm/drm_edid.c
>> @@ -28,6 +28,7 @@
>>    * DEALINGS IN THE SOFTWARE.
>>    */
>>   
>> +#include <acpi/video.h>
>>   #include <linux/bitfield.h>
>>   #include <linux/cec.h>
>>   #include <linux/hdmi.h>
>> @@ -2188,6 +2189,47 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len)
>>   	return ret == xfers ? 0 : -1;
>>   }
>>   
>> +/**
>> + * drm_do_probe_acpi_edid() - get EDID information via ACPI _DDC
>> + * @data: struct drm_device
>> + * @buf: EDID data buffer to be filled
>> + * @block: 128 byte EDID block to start fetching from
>> + * @len: EDID data buffer length to fetch
>> + *
>> + * Try to fetch EDID information by calling acpi_video_get_edid() function.
>> + *
>> + * Return: 0 on success or error code on failure.
>> + */
>> +static int
>> +drm_do_probe_acpi_edid(void *data, u8 *buf, unsigned int block, size_t len)
>> +{
>> +	struct drm_device *ddev = data;
>> +	struct acpi_device *acpidev = ACPI_COMPANION(ddev->dev);
>> +	unsigned char start = block * EDID_LENGTH;
>> +	void *edid;
>> +	int r;
>> +
>> +	if (!acpidev)
>> +		return -ENODEV;
>> +
>> +	/* fetch the entire edid from BIOS */
>> +	r = acpi_video_get_edid(acpidev, ACPI_VIDEO_DISPLAY_LCD, -1, &edid);
>> +	if (r < 0) {
>> +		DRM_DEBUG_KMS("Failed to get EDID from ACPI: %d\n", r);
>> +		return -EINVAL;
>> +	}
>> +	if (len > r || start > r || start + len > r) {
>> +		r = EINVAL;
>> +		goto cleanup;
>> +	}
>> +
>> +	memcpy(buf, edid + start, len);
>> +	r = 0;
>> +cleanup:
>> +	kfree(edid);
>> +	return r;
>> +}
>> +
>>   static void connector_bad_edid(struct drm_connector *connector,
>>   			       const struct edid *edid, int num_blocks)
>>   {
>> @@ -2643,6 +2685,37 @@ struct edid *drm_get_edid(struct drm_connector *connector,
>>   }
>>   EXPORT_SYMBOL(drm_get_edid);
>>   
>> +/**
>> + * drm_get_acpi_edid - get EDID data, if available
>> + * @connector: connector we're probing
>> + *
>> + * Use the BIOS to attempt to grab EDID data if possible.  If found,
>> + * attach it to the connector.
>> + *
>> + * Return: Pointer to valid EDID or NULL if we couldn't find any.
>> + */
>> +struct edid *drm_get_acpi_edid(struct drm_connector *connector)
>> +{
>> +	struct edid *edid = NULL;
>> +
>> +	switch (connector->connector_type) {
>> +	case DRM_MODE_CONNECTOR_LVDS:
>> +	case DRM_MODE_CONNECTOR_eDP:
>> +		break;
>> +	default:
>> +		return NULL;
>> +	}
>> +
>> +	if (connector->force == DRM_FORCE_OFF)
>> +		return NULL;
>> +
>> +	edid = _drm_do_get_edid(connector, drm_do_probe_acpi_edid, connector->dev, NULL);
>> +
>> +	drm_connector_update_edid_property(connector, edid);
>> +	return edid;
>> +}
>> +EXPORT_SYMBOL(drm_get_acpi_edid);
>> +
>>   /**
>>    * drm_edid_read_custom - Read EDID data using given EDID block read function
>>    * @connector: Connector to use
>> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
>> index 518d1b8106c7..60fbdc06badc 100644
>> --- a/include/drm/drm_edid.h
>> +++ b/include/drm/drm_edid.h
>> @@ -412,6 +412,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
>>   	void *data);
>>   struct edid *drm_get_edid(struct drm_connector *connector,
>>   			  struct i2c_adapter *adapter);
>> +struct edid *drm_get_acpi_edid(struct drm_connector *connector);
>>   u32 drm_edid_get_panel_id(struct i2c_adapter *adapter);
>>   struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
>>   				     struct i2c_adapter *adapter);
>