Received-SPF: pass (google.com: domain of linux-kernel+bounces-194280-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <cff85fde-01d5-4487-ba4d-39c3b787a62b@amd.com>
Date: Wed, 29 May 2024 09:34:34 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2] drm/client: Detect when ACPI lid is closed during
 initialization
To: Alex Deucher <alexdeucher@gmail.com>,
 Jani Nikula <jani.nikula@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>
 <CADnq5_OzPT1MVnsqXs2vjr1L2_6jeM6x7jgs4ZtYpNzdDHM6uA@mail.gmail.com>
 <87r0dkiv4o.fsf@intel.com>
 <CADnq5_NiJ9a7uYPGj9iuePTRBFKGhhFA6G982bxO2kHe-_5ASA@mail.gmail.com>
Content-Language: en-US
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <CADnq5_NiJ9a7uYPGj9iuePTRBFKGhhFA6G982bxO2kHe-_5ASA@mail.gmail.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?M2VvSUZSK3hLQWZCNGlPQjBEOTUydER4bUZ3bk5NNXZQeW1MRnU4aTNhSnNZ?=
 =?utf-8?B?Q2xKbzVjbzJmVnREVjZYWHFnb0RXdENpMGh5TjAwY2UxYmRLcjAzMDByYldz?=
 =?utf-8?B?OVhOZ0tUdmVSbUt0YlBKSnJXbFVGZFNZcHlPQU5WMVZxU2lZenBMeFRTSFhk?=
 =?utf-8?B?WkxVMXU3OVpXMVVlai9WSWZWeWw3N01BRTJ2a1oxVWFqUC8rT3hsODNpN0k5?=
 =?utf-8?B?cnRTTkw4SWQ3T2VscmV2YlFRcTNTVm85UTZwczVwMXQ3U3YxTERZRzcwakpz?=
 =?utf-8?B?bHo5VytzOWJQVkhIN3lQaDBUbVdabW5vdlZKcUlpbG9pUW5wWXFyNGhlOGFI?=
 =?utf-8?B?UENaeCttTGtsc204bHZ2RjdlSU4yR1diTmdZLzUwUjBVcGY1STZNRjRDdjNZ?=
 =?utf-8?B?bWw1NmhISTVZZmdFWGhLRkMyd2ppUGN1Zkx6aE5kY2xzUEpGeVZsT1czN1ZO?=
 =?utf-8?B?L0JQMi9yWWZscEtBNWxKcllVN0RIU2pwV0ZscDE4emFqNEFuamFUUlNjYXRv?=
 =?utf-8?B?YUEwOER5UCsrOHg0aUhzQW1tWFBCNjdEKytPV01ZZFMxZWZSTUpieEdmZU9J?=
 =?utf-8?B?Z1VoZUZGelVWTm1YWmk5MStpNVBvMXFWNVdQRTRMOTlVWUoyQkdtL1k5V2dj?=
 =?utf-8?B?cFU2MEdYRi9xV0xqSk5jdm5xNng5eHNqeFQrT3g3RjFoRS9mY3hRQk80WGsr?=
 =?utf-8?B?aEp4K2s2M0tBd0hQS1drd0x2OExqTW9IbVZHWDh2WTVBSmlacVNFYWFMNlhU?=
 =?utf-8?B?ZlM5UE5LaERVSEdUZUFmUTZvRXRJMVYrbDV2eDBueFFhNitIQ3Y5QTVOTm05?=
 =?utf-8?B?SUV6amJ3aHZsWXhETmEydHdlclFXWHpadlhrell3SEUwZGg1ak91RWxGOGo1?=
 =?utf-8?B?SFl6bEhCNlJWOEdxU3JjSXVNUE1JWGxPS2hYbkgzYnZkSGh2QlZOdXBERXN4?=
 =?utf-8?B?L0xUMDdkYXYwWnhYcTVlc1ZzajJqbzg1UXJzZzFZdEMyTkxMRWpKRElKVW9I?=
 =?utf-8?B?dTZMbURtZkhwbE9IdGRzMG5zYXF6dy9wMHRqK2t4alRVbUJyUGNDV2s5dXlH?=
 =?utf-8?B?M05Rb0QrRzVyVDEzbHUzM0YwaGlHVFh5QjRqbmFHV05SbWx1SHFMWWxRQU1O?=
 =?utf-8?B?V3ozVHdOSFN6cTBBUXIxcTJXSERsa3lwcFhFcVpsb2theHRQREtrWFNXdGph?=
 =?utf-8?B?cjlSbkREcmJaTGRiV08rcXlZZW43SlMxYU0vWmlxWXhmenN0aW5IQU8ycXRz?=
 =?utf-8?B?TERsOFZxVFdvOVNoazV0U0NsY3JwYmNaS09mZTc0ZFVQNEFZUjVwcEtOTHh0?=
 =?utf-8?B?bVFpT1lWUlFBZGV1SjhNVWZ5R1dDVTlzNUs3QkoyS1VEOGpIZCtZcTZGMzNB?=
 =?utf-8?B?b2piamwzdGZjajFOTjlvNlk4OE42OXpIRDViYXFQQmc4OUpNU2FFcDEwSjFw?=
 =?utf-8?B?NTh3K3lKYmFDQThIWmVXZERrdFZpb0xCaCszQWtLaU5FbHRuVlV3TDV4KzNp?=
 =?utf-8?B?VVlOOXI1K2xVTXI3OVNBU0FXZDJFYkMzeW5qVGx2bWVoVGwwMklBYm5iM3FI?=
 =?utf-8?B?a1FlSXVOSEY3d3dDek9UZFlFTHNxeUkvNmM3ell0UWZBREJmUEpNdnNJS1Ez?=
 =?utf-8?B?cTRkM1NUVklidzM0T2NSL29DdjBTbGJqYXhiQW5jWjFySXVoRVl6Um94dDNE?=
 =?utf-8?B?alVDLytienNrcGx1bWw1aVNXY2FFdWZ3UlJjV2pVQy9mZ3QvR043NXF0Rk5w?=
 =?utf-8?B?elZQbHpJK1pBOUlQY2VIeGNkMmVHeVJyc2U1anFteDlCWWNLa1lwM0l4NVor?=
 =?utf-8?B?SzJmcGpnZm1kSzk1Q1Q5SjJYTE5oeFRZek1sSUxMQ1VQOGV4ZFJ3endlZlZt?=
 =?utf-8?B?eERPWmllZGNER1dwY0xSeUQzanRXZEozSmRhZmZ3eW1ieGtSbS9TL05Rc1dk?=
 =?utf-8?B?QXMvVmpZSWpyL2F0TXpUL3huRThKMVlLQVZteEV6M1dJa095TGtmUWtQOGM1?=
 =?utf-8?B?S0tZRnNrdlhYcDVmRlF6QktFUzZpd2Rzcm5aTUJEY1F3K2tpMHlUcks2R1JX?=
 =?utf-8?B?Nmx2akVzZUY3N0JLNnlvT2lGSzZkR1pZYUlwU1E0dWV0Vkk3UEFQbUZNay84?=
 =?utf-8?Q?0S2UNmHsNaoy0OYs8xEszsnc7?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fc73841d-ea1f-4952-a495-08dc7fec7a77
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:34:42.4835
 (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: HQ7PdDPV8fCg4MBC6MdERioxopvfvhH77yoy22kNDw6mcfpyexAtN0REmnKDCQqoxznrpc3/pNmSXqJU1H3uIg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6812

On 5/29/2024 08:55, Alex Deucher wrote:
> On Wed, May 29, 2024 at 9:51 AM Jani Nikula <jani.nikula@linux.intel.com> wrote:
>>
>> On Wed, 29 May 2024, Alex Deucher <alexdeucher@gmail.com> wrote:
>>> On Tue, May 28, 2024 at 5:03 PM Mario Limonciello
>>> <mario.limonciello@amd.com> 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>
>>>
>>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>>
>>> Do you have drm-misc access or do you need someone to apply this for you?
>>
>> I've bounced this to intel-gfx and intel-xe lists to get CI testing. I'd
>> appreciate holding off on merging until we have results.
> 
> Sure.

Thanks for the review and pushing it to CI testing infra.

I don't have any drm-misc access so if everything looks good then one of 
you guys please merge it for me.

Thanks!

> 
> Alex
> 
>>
>> Thanks,
>> Jani.
>>
>>>
>>> Alex
>>>
>>>> ---
>>>> 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;
>>>> +               }
>>>> +       }
>>>> +}
>>>> +
>>>>   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
>>>>
>>
>> --
>> Jani Nikula, Intel