Received-SPF: pass (google.com: domain of linux-kernel+bounces-194295-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <197d195f-9206-41dd-8ff1-f4bb4988fb9b@amd.com>
Date: Wed, 29 May 2024 09:45:55 -0500
User-Agent: Mozilla Thunderbird
From: Mario Limonciello <mario.limonciello@amd.com>
Subject: Re: [PATCH v2] drm/client: Detect when ACPI lid is closed during
 initialization
To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
 Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
 Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>,
 David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
 linux-kernel@vger.kernel.org, Chris Bainbridge <chris.bainbridge@gmail.com>,
 hughsient@gmail.com
References: <20240528210319.1242-1-mario.limonciello@amd.com>
 <Zlc4V1goFvU2antl@intel.com>
Content-Language: en-US
In-Reply-To: <Zlc4V1goFvU2antl@intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TlhydWVGZkoyazZzYkh6b1BqNTBjTWwwNG5iMHArN1NYWkRYcjhvTzZMSXBl?=
 =?utf-8?B?QlY2YmhpeVNiaEE2ZmZBL2ZjV0pHai9DdTFFUzQ0QitXMW1VN1F3R0tsM1o0?=
 =?utf-8?B?UUQwckRmTEZneWNwS0NOWkN3ZnJzdlVkckJ3eW9VS0JPRTk5TjRFamZIOUU5?=
 =?utf-8?B?ZnF6Y3NGRWxZd2FONEwwdHVPWVNFem9BaWNQckxWYmdZbnE3KzFKalB4eEdn?=
 =?utf-8?B?YytwRGpEdTdxbHgwOUpzZ2lUQllTWEhCenV4THlqQWY1V01wNXdjUkpHSGla?=
 =?utf-8?B?alB6UlplVlpLSFAzRXN6eWl1bXE1UmZkMGNDbHpTVXZKVWJYNTMvdTZORWVX?=
 =?utf-8?B?elpjTDRqZFg5Wk1OMDIrcmNkOVNHNzYzenV1T0Fjc09sbWh5ZmZKcXNiV1VP?=
 =?utf-8?B?M3c5YTRTazZWN3ZmeVBrcjVZZ0NpVnJIMXl5eHEwQnJFVzVpd2gyYjhoTVV2?=
 =?utf-8?B?NWZxbGtMbXlhS09NckwxNjRjTDZuQTgvR0ZQTjBqSDRqVDIrc25DTlVWOXA4?=
 =?utf-8?B?QUdlY1d6SFVBdHEvRWpxZ2JOZzBsV0daMEVFVU11Tzl5YmViSzU0clFCV1N5?=
 =?utf-8?B?dExDNlBOTlNNQUJXRmF0UGxGdnJXT0NXWFdJdGtmTUlnNzdsKzhzSDhDK3dU?=
 =?utf-8?B?U01Mb0d0NjdNUmkrTDhhV3dJcXlqaE5wRTByeEdyUVc1dXJyeUVMVi9sTml5?=
 =?utf-8?B?ZHlyaGNCRGszOEpUV2pRT3dCcW4wUGxaNW45b3NmWm9tdW85MnRFMkZnMWRv?=
 =?utf-8?B?NWFISXBpRW0ra0RuT1N1QThHZzVRUjh4aDJvVEhqYVVhVlBsTFFNdm05cDh3?=
 =?utf-8?B?Y3gyMGFVMzJCQzlQZTEzM2ljV1hjUWNsMzB0T1A3UkZBanNuR2xkbXdXRFI3?=
 =?utf-8?B?VDFhVVdGa3RhWG93NDl6aEtLTTB6dVBsUFVxOTh6ei94VnU0VHNpNVpuNUov?=
 =?utf-8?B?OU9WNnVrRDZSUlY3NWpJaDhSWC8wWDlyaERQN2NsazlNUEI0QXYrSlBBRVR1?=
 =?utf-8?B?TmFrdGtmQ2VDMS9xTHZObzNEK0ErU2V2WldHTWJsMDNJa2UyUVAxNStKVG43?=
 =?utf-8?B?bVp1emFaRjF4VURrb0JyMUdiQkxCVXJxbnNGelAwc1haNDErL2Y4L2plcXVE?=
 =?utf-8?B?ZWM4SElQTVNtYjZBN0paUnRYYy9ObHVHQ1BLNllRSmYrQ0VYUjljOXRqelFO?=
 =?utf-8?B?WWNETDdlcWx1RWVQc0dGUFVHL1lzOThPek55Z2JGMGNUYkl4M0k0K2hKZjho?=
 =?utf-8?B?b2c5QVpONXJuSUxOMXp2bk91Z3BGKy9TYTR6azZiNEtmRWVhVFczUE52QmFY?=
 =?utf-8?B?akpTTXJKY1JWSmtpSndEZmZmNEwzWjJXRVp5QVI2Qm9pOWtrSGhmcDV3OFY0?=
 =?utf-8?B?OGVSbVpVcEYxQUU2TnN5ZVBJajJLV3JRdzd3L200QklwQ3pjR3JMeVRpT0hN?=
 =?utf-8?B?bU9OUSs2QSt3bkZ4RE9scDRCQ3BwV0d6NTg2a05GRm1IQmtwSkZKa3NDdFRW?=
 =?utf-8?B?RDExV2dGWHFyWmJSV0l0R3Z2OEZ1dm96c0xTVXcvZXVoVk1wVk1abGN3RUlS?=
 =?utf-8?B?Vll2T0ZXVHRidHpXUE1oRWl4cmU1VXpObWUyTTFxdFp1akVaTHRxRTNzeU1r?=
 =?utf-8?B?SWh2UG5TaXM3SkJ3UTgvVmtjT2lydFpxdGNFdDRvNU5Zd3pMbTN4bnFMTlBB?=
 =?utf-8?B?TVN6K1dib2VTKzIxRVFwRUt0cHkwbFNhdmxYS0R5VG5YV2J0a2dKUDZycVV1?=
 =?utf-8?B?V1dhQnZqNHEwV3hLMkVISUtScmtadVptd0JMZCtvbUVXeEdRV1lMMVdFTWFC?=
 =?utf-8?B?dXZiUmZlNDkrelFBa29udU4zeHd2ZmoxVGRqQVFYZEMwNWNkWnB5NDBmTE5F?=
 =?utf-8?B?Uk1yMmdBekxlRmhTL1FlRXBmZUxsb2pBZDJYR3k0UVNPeGxnM2ZjamxaMGtS?=
 =?utf-8?B?V01TK3RnR2xRMGdyaHZDdXVYRTJaN2xYQkdyWTNpNWhyR1QwV1JIRUMydHJP?=
 =?utf-8?B?ZjczZlNFV05KTWs5S2w0Wk8xeWsrY3djMjB6YUF6OHpzRGdTaVJkOGxKdXlN?=
 =?utf-8?B?OWI1T0xCOGtwNmE5S3QyODgyNXY1SGdGbXRZdUNwVUhodms1eUVmZWRwSEk5?=
 =?utf-8?Q?7lumjl1xmSYxNUGIQnS59D3Bi?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f621f36c-e6b6-487c-8c3a-08dc7fee0ede
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 14:46:00.9150
 (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: UuVa5hPkb7HzWwT8qnlHUe6X+8hiIXX/L7bf1NjKN8xIQDKtg26shwsluKKQkSLt9ya4dIyGogEVB3gvSzoqsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9349

On 5/29/2024 09:14, Ville Syrjälä wrote:
> On Tue, May 28, 2024 at 04:03:19PM -0500, Mario Limonciello wrote:
>> If the lid on a laptop is closed when eDP connectors are populated
>> then it remains enabled when the initial framebuffer configuration
>> is built.
>>
>> When creating the initial framebuffer configuration detect the ACPI
>> lid status and if it's closed disable any eDP connectors.
>>
>> Reported-by: Chris Bainbridge <chris.bainbridge@gmail.com>
>> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3349
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>> Cc: hughsient@gmail.com
>> v1->v2:
>>   * Match LVDS as well
>> ---
>>   drivers/gpu/drm/drm_client_modeset.c | 30 ++++++++++++++++++++++++++++
>>   1 file changed, 30 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
>> index 31af5cf37a09..0b0411086e76 100644
>> --- a/drivers/gpu/drm/drm_client_modeset.c
>> +++ b/drivers/gpu/drm/drm_client_modeset.c
>> @@ -8,6 +8,7 @@
>>    */
>>   
>>   #include "drm/drm_modeset_lock.h"
>> +#include <acpi/button.h>
>>   #include <linux/module.h>
>>   #include <linux/mutex.h>
>>   #include <linux/slab.h>
>> @@ -257,6 +258,34 @@ static void drm_client_connectors_enabled(struct drm_connector **connectors,
>>   		enabled[i] = drm_connector_enabled(connectors[i], false);
>>   }
>>   
>> +static void drm_client_match_edp_lid(struct drm_device *dev,
>> +				     struct drm_connector **connectors,
>> +				     unsigned int connector_count,
>> +				     bool *enabled)
>> +{
>> +	int i;
>> +
>> +	for (i = 0; i < connector_count; i++) {
>> +		struct drm_connector *connector = connectors[i];
>> +
>> +		switch (connector->connector_type) {
>> +		case DRM_MODE_CONNECTOR_LVDS:
>> +		case DRM_MODE_CONNECTOR_eDP:
>> +			if (!enabled[i])
>> +				continue;
>> +			break;
>> +		default:
>> +			continue;
>> +		}
>> +
>> +		if (!acpi_lid_open()) {
>> +			drm_dbg_kms(dev, "[CONNECTOR:%d:%s] lid is closed, disabling\n",
>> +				    connector->base.id, connector->name);
>> +			enabled[i] = false;
>> +		}
>> +	}
>> +}
> 
> If you don't hook into some lid notify event how is one supposed to get
> the display back to life after opening the lid?

I guess in my mind it's a tangential to the "initial modeset".  The DRM 
master can issue a modeset to enable the combination as desired.

When I tested I did confirm that with mutter such an event is received 
and it does the modeset to enable the eDP when lid is opened.

Let me ask this - what happens if no DRM master running and you hotplug 
a DP cable?  Does a "new" clone configuration get done?
> 
>> +
>>   static bool drm_client_target_cloned(struct drm_device *dev,
>>   				     struct drm_connector **connectors,
>>   				     unsigned int connector_count,
>> @@ -844,6 +873,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
>>   		memset(crtcs, 0, connector_count * sizeof(*crtcs));
>>   		memset(offsets, 0, connector_count * sizeof(*offsets));
>>   
>> +		drm_client_match_edp_lid(dev, connectors, connector_count, enabled);
>>   		if (!drm_client_target_cloned(dev, connectors, connector_count, modes,
>>   					      offsets, enabled, width, height) &&
>>   		    !drm_client_target_preferred(dev, connectors, connector_count, modes,
>> -- 
>> 2.43.0
>