[Bug 57434] i915: black screen after blank when LID is closed on Linux >= 3.1

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=57434

--- Comment #1 from Krzysztof Mazur <krzysiek at podlesie.net> ---
Created attachment 70463
  --> https://bugs.freedesktop.org/attachment.cgi?id=70463&action=edit
Linux v3.6+noacpivideo+workaround dmesg, works correctly

Disabling ACPI video is needed to workaround some strange problems on this
system. With ACPI video enabled the LID does not work and the problem
cannot be easily reproduced.

The workaround "reverts" commit that caused regression in Linux 3.1.

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 1e0a9e1..ff2126c 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -389,6 +389,13 @@ static int __init video_set_bqc_offset(const struct
dmi_system_id *d)
     return 0;
 }

+static int acpi_video_disabled;
+static int __init disable_acpi_video(const struct dmi_system_id *d)
+{
+    acpi_video_disabled = 1;
+    return 0;
+}
+
 static struct dmi_system_id video_dmi_table[] __initdata = {
     /*
      * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -433,6 +440,14 @@ static struct dmi_system_id video_dmi_table[] __initdata =
{
         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"),
         },
     },
+    {
+     .callback = disable_acpi_video,
+     .ident = "Hewlett-Packard nc6120",
+     .matches = {
+        DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "NC6120(EK094ES)"),
+        },
+    },
     {}
 };

@@ -1779,6 +1794,10 @@ static int __init intel_opregion_present(void)
 int acpi_video_register(void)
 {
     int result = 0;
+
+    if (acpi_video_disabled)
+        return -ENODEV;
+
     if (register_count) {
         /*
          * if the function of acpi_video_register is already called,
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index c040aee..2d26432 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4980,10 +4980,12 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                           x, y, old_fb);
     drm_vblank_post_modeset(dev, pipe);

+#if 0
     if (ret)
         intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
     else
         intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
+#endif

     return ret;
 }

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20121122/9820022f/attachment-0001.html>