Re: [PATCH v2] drm/client: Detect when ACPI lid is closed during initialization

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 5/29/2024 08:55, Alex Deucher wrote:
On Wed, May 29, 2024 at 9:51 AM Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> wrote:

On Wed, 29 May 2024, Alex Deucher <alexdeucher@xxxxxxxxx> wrote:
On Tue, May 28, 2024 at 5:03 PM Mario Limonciello
<mario.limonciello@xxxxxxx> 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@xxxxxxxxx>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3349
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>

Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

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@xxxxxxxxx
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




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux