Revert "Skip intel_crt_init for Dell XPS 8700"
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 26 Sep 2016 09:20:44 +0000 (12:20 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 6 Oct 2016 14:06:52 +0000 (17:06 +0300)
This reverts commit 10b6ee4a87811a110cb01eaca01eb04da6801baf.

According to [1] Dell XPS8700 VBT says 'int_crt_support 0', so thanks
to commit e4abb733bb72 ("drm/i915: Check VBT for CRT port presence on
HSW/BDW") we no longer need to blacklist it based on DMI.

Looking through the bug report, SFUSE_STRAP based detection was
apparently also tried and failed, but the VBT based one should still
work just fine.

The commit says that the symptom was a frozen machine, but based on the
bug report it doesn't look like the CRT detection was at least directly
responsible for such a drastic outcome.

Cc: Giacomo Comes <comes@naic.edu>
References: https://bugs.freedesktop.org/show_bug.cgi?id=73559
References: http://lists.freedesktop.org/archives/intel-gfx/2014-January/038178.html [1]
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474881646-1326-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_crt.c

index 88ebbdde185a549ea37c5f58b069aab1d62b094e..ba372c239d486210c6651add48451dc165115ae0 100644 (file)
@@ -823,14 +823,6 @@ static const struct dmi_system_id intel_no_crt[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
                },
        },
-       {
-               .callback = intel_no_crt_dmi_callback,
-               .ident = "DELL XPS 8700",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "XPS 8700"),
-               },
-       },
        { }
 };