From mboxrd@z Thu Jan 1 00:00:00 1970 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 86DD7C27C79 for ; Mon, 17 Jun 2024 14:31:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E53FE10E3F6; Mon, 17 Jun 2024 14:31:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; secure) header.d=ffwll.ch header.i=@ffwll.ch header.b="fgNfWif9"; dkim-atps=neutral Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id D00DB10E3F9 for ; Mon, 17 Jun 2024 14:31:33 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-35f23f3da48so358124f8f.3 for ; Mon, 17 Jun 2024 07:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1718634692; x=1719239492; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=OFrClsbz0DcKEfzLpYHsnVFFxJbCJ2qPD/ZaJWhUEbE=; b=fgNfWif9o7Sz3cLLXhb4y66zyUj3fmC6+dm24WaAwtuSkYtyre3dljlwFih7TpE/11 ErBjJTSWLvVf6SlMUXZBMDEJwiD0LqxzGYk2rLSzIyLXs3dfZf3uhlHM0edhWwv1hV1Y Oi/okUYm5BXrh48Yn/d5sJjpfKjwgTEHdlJig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718634692; x=1719239492; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OFrClsbz0DcKEfzLpYHsnVFFxJbCJ2qPD/ZaJWhUEbE=; b=O5M+SrR+X41n3UUh40jGDkbMBIzL1sel50ErjPOJIk9yif+QPl3vr85jRg3RyOpgn2 hzyREJzVxZHeqNiJ4kPoWKeW9xjbg+1Vdvax6ss/a9I8zO35MlsqSBfQy9nBrYrx+3F0 3rNXlXEXs4uIec28W73qXn5T0ZSZKIfoHseHQoiNBFy3bTMevJCJD2WFAQlg26TSga5T kISSLBow0+zwSvr7qCrhn+KyImcRuSY1mdK9lwtxkx53q5vHJ7aJrIfwuraptSvgfIcc IV5ZSFjQJSzvNOzzy2Cy7ApY2+kQOCDJ7S7jTriMD46y95kOdzQS+1O4vpx9+nraDqR3 EScg== X-Forwarded-Encrypted: i=1; AJvYcCWGaK3nYFEHvfie759hS8gNISkdJDzgXpJvMhJW2tOOGRj3kmJoM7TcEIc1KpnN5LQvA+l90Q43y3FEwvuMrz9js8k29aqCOHsiRlp/eQ== X-Gm-Message-State: AOJu0YzZxL6rDKyeTJ8xUbQ87C/+4xW2/duAdY/Kw2vMrvPM65q1aCAD 53XWoDPbUoGeP4DlWW/4f2H4DLZezCL3WN0KP29p/t2Raf9HNND3oEfd7N9m1ji7AGWc1+spRaY k X-Google-Smtp-Source: AGHT+IGXPxMb2tkpyM925AxgZEFgyosdjcu8hU3w7t1pqYzMjv7nzIXUK7ZqskCj9FirEMoANfpt1A== X-Received: by 2002:a05:6000:4029:b0:360:872b:7e03 with SMTP id ffacd0b85a97d-360872b7ed8mr5475347f8f.0.1718634691731; Mon, 17 Jun 2024 07:31:31 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42286eef70csm200033675e9.3.2024.06.17.07.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 07:31:31 -0700 (PDT) Date: Mon, 17 Jun 2024 16:31:29 +0200 From: Daniel Vetter To: Mario Limonciello Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , "open list:DRM DRIVERS" , open list , amd-gfx@lists.freedesktop.org, Dmitry Torokhov , Chris Bainbridge Subject: Re: [PATCH v3] drm/fb-helper: Detect when lid is closed during initialization Message-ID: Mail-Followup-To: Mario Limonciello , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , "open list:DRM DRIVERS" , open list , amd-gfx@lists.freedesktop.org, Dmitry Torokhov , Chris Bainbridge References: <20240613051700.1112-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240613051700.1112-1-mario.limonciello@amd.com> X-Operating-System: Linux phenom 6.8.9-amd64 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Thu, Jun 13, 2024 at 12:17:00AM -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 > lid status and if it's closed disable any eDP connectors. > > Also set up a workqueue to monitor for any future lid events. > > Suggested-by: Dmitry Torokhov > Reported-by: Chris Bainbridge > Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3349 > Signed-off-by: Mario Limonciello More fundamental question: Do we even want to solve this issues? This is fbdev we're talking about, if people use this actually in production, they don't care much about the fallout. Plus this has the potential to cause regressions, like we might not be able to enable edp after having enabled and external screen. Which would be bad. Imo this needs a lot more justification than "one random user asked for it". Especially since it's been the behaviour for like well over a decade for any integrated panel that we just light them always up when using fbdev/fbcon. If people want full control over all this, they can use a display manager (or a userspace console). Cheers, Sima > --- > v2->v3: > * Use input device instead of ACPI device > * Detect lid open/close events > --- > drivers/gpu/drm/drm_client_modeset.c | 29 ++++++ > drivers/gpu/drm/drm_fb_helper.c | 132 +++++++++++++++++++++++++++ > include/drm/drm_device.h | 6 ++ > include/drm/drm_fb_helper.h | 2 + > 4 files changed, 169 insertions(+) > > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c > index 31af5cf37a09..b8adfe87334b 100644 > --- a/drivers/gpu/drm/drm_client_modeset.c > +++ b/drivers/gpu/drm/drm_client_modeset.c > @@ -257,6 +257,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 (dev->lid_closed) { > + 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 +872,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, > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index d612133e2cf7..41dd5887599a 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -30,6 +30,8 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include > +#include > +#include > #include > #include > #include > @@ -413,6 +415,128 @@ static void drm_fb_helper_damage_work(struct work_struct *work) > drm_fb_helper_fb_dirty(helper); > } > > +static void drm_fb_helper_lid_event(struct input_handle *handle, unsigned int type, > + unsigned int code, int value) > +{ > + if (type == EV_SW && code == SW_LID) { > + struct drm_fb_helper *fb_helper = handle->handler->private; > + > + if (value != fb_helper->dev->lid_closed) { > + fb_helper->dev->lid_closed = value; > + queue_work(fb_helper->input_wq, &fb_helper->lid_work); > + } > + } > +} > + > +struct drm_fb_lid { > + struct input_handle handle; > +}; > + > +static int drm_fb_helper_lid_connect(struct input_handler *handler, > + struct input_dev *dev, > + const struct input_device_id *id) > +{ > + struct drm_fb_helper *fb_helper = handler->private; > + struct drm_fb_lid *lid; > + char *name; > + int error; > + > + lid = kzalloc(sizeof(*lid), GFP_KERNEL); > + if (!lid) > + return -ENOMEM; > + > + name = kasprintf(GFP_KERNEL, "drm-fb-helper-lid-%s", dev_name(&dev->dev)); > + if (!name) { > + error = -ENOMEM; > + goto err_free_lid; > + } > + > + lid->handle.dev = dev; > + lid->handle.handler = handler; > + lid->handle.name = name; > + lid->handle.private = lid; > + > + error = input_register_handle(&lid->handle); > + if (error) > + goto err_free_name; > + > + error = input_open_device(&lid->handle); > + if (error) > + goto err_unregister_handle; > + > + fb_helper->dev->lid_closed = dev->sw[SW_LID]; > + drm_dbg_kms(fb_helper->dev, "initial lid state is set to %d\n", fb_helper->dev->lid_closed); > + > + return 0; > + > +err_unregister_handle: > + input_unregister_handle(&lid->handle); > +err_free_name: > + kfree(name); > +err_free_lid: > + kfree(lid); > + return error; > +} > + > +static void drm_fb_helper_lid_disconnect(struct input_handle *handle) > +{ > + struct drm_fb_lid *lid = handle->private; > + > + input_close_device(handle); > + input_unregister_handle(handle); > + > + kfree(handle->name); > + kfree(lid); > +} > + > +static const struct input_device_id drm_fb_helper_lid_ids[] = { > + { > + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT, > + .evbit = { BIT_MASK(EV_SW) }, > + .swbit = { [BIT_WORD(SW_LID)] = BIT_MASK(SW_LID) }, > + }, > + { }, > +}; > + > +static struct input_handler drm_fb_helper_lid_handler = { > + .event = drm_fb_helper_lid_event, > + .connect = drm_fb_helper_lid_connect, > + .disconnect = drm_fb_helper_lid_disconnect, > + .name = "drm-fb-helper-lid", > + .id_table = drm_fb_helper_lid_ids, > +}; > + > +static void drm_fb_helper_lid_work(struct work_struct *work) > +{ > + struct drm_fb_helper *fb_helper = container_of(work, struct drm_fb_helper, > + lid_work); > + drm_fb_helper_hotplug_event(fb_helper); > +} > + > +static int drm_fb_helper_create_lid_handler(struct drm_fb_helper *fb_helper) > +{ > + int ret = 0; > + > + if (fb_helper->deferred_setup) > + return 0; > + > + fb_helper->input_wq = create_singlethread_workqueue("drm-fb-lid"); > + if (fb_helper->input_wq == NULL) > + return -ENOMEM; > + > + drm_fb_helper_lid_handler.private = fb_helper; > + ret = input_register_handler(&drm_fb_helper_lid_handler); > + if (ret) > + goto remove_wq; > + > + return 0; > + > +remove_wq: > + destroy_workqueue(fb_helper->input_wq); > + fb_helper->input_wq = NULL; > + return ret; > +} > + > /** > * drm_fb_helper_prepare - setup a drm_fb_helper structure > * @dev: DRM device > @@ -445,6 +569,7 @@ void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, > spin_lock_init(&helper->damage_lock); > INIT_WORK(&helper->resume_work, drm_fb_helper_resume_worker); > INIT_WORK(&helper->damage_work, drm_fb_helper_damage_work); > + INIT_WORK(&helper->lid_work, drm_fb_helper_lid_work); > helper->damage_clip.x1 = helper->damage_clip.y1 = ~0; > mutex_init(&helper->lock); > helper->funcs = funcs; > @@ -593,6 +718,9 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) > if (!drm_fbdev_emulation) > return; > > + input_unregister_handler(&drm_fb_helper_lid_handler); > + destroy_workqueue(fb_helper->input_wq); > + > cancel_work_sync(&fb_helper->resume_work); > cancel_work_sync(&fb_helper->damage_work); > > @@ -1842,6 +1970,10 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper) > width = dev->mode_config.max_width; > height = dev->mode_config.max_height; > > + ret = drm_fb_helper_create_lid_handler(fb_helper); > + if (ret) > + return ret; > + > drm_client_modeset_probe(&fb_helper->client, width, height); > ret = drm_fb_helper_single_fb_probe(fb_helper); > if (ret < 0) { > diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h > index 63767cf24371..619af597784c 100644 > --- a/include/drm/drm_device.h > +++ b/include/drm/drm_device.h > @@ -316,6 +316,12 @@ struct drm_device { > * Root directory for debugfs files. > */ > struct dentry *debugfs_root; > + > + /** > + * @lid_closed: Flag to tell the lid switch state > + */ > + bool lid_closed; > + > }; > > #endif > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 375737fd6c36..7fb36c10299d 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -143,6 +143,8 @@ struct drm_fb_helper { > spinlock_t damage_lock; > struct work_struct damage_work; > struct work_struct resume_work; > + struct work_struct lid_work; > + struct workqueue_struct *input_wq; > > /** > * @lock: > -- > 2.43.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch