From da334a5ce324cb942e014c8d11b55dc2ad8196ff Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 29 Nov 2011 11:19:12 -0500 Subject: [PATCH] Drop drm-intel-make-lvds-work.patch (rhbz #731296) Discussed this with mjg59 and ajax. This fix was supposed to go upstream, but never actually made it. Since it's breaking xrandr, we're dropping it. --- drm-intel-make-lvds-work.patch | 18 ------------------ kernel.spec | 4 +--- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 drm-intel-make-lvds-work.patch diff --git a/drm-intel-make-lvds-work.patch b/drm-intel-make-lvds-work.patch deleted file mode 100644 index 89f4e2d48..000000000 --- a/drm-intel-make-lvds-work.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/drivers/gpu/drm/i915/intel_display.c -+++ b/drivers/gpu/drm/i915/intel_display.c -@@ -5821,7 +5821,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, - struct intel_load_detect_pipe *old) - { - struct drm_encoder *encoder = &intel_encoder->base; -- struct drm_device *dev = encoder->dev; - struct drm_crtc *crtc = encoder->crtc; - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; -@@ -5832,7 +5831,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, - - if (old->load_detect_temp) { - connector->encoder = NULL; -- drm_helper_disable_unused_functions(dev); - - if (old->release_fb) - old->release_fb->funcs->destroy(old->release_fb); diff --git a/kernel.spec b/kernel.spec index ad55589de..4fe3e41dc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -702,8 +702,6 @@ Patch1500: fix_xen_guest_on_old_EC2.patch Patch1810: drm-nouveau-updates.patch # intel drm is all merged upstream Patch1824: drm-intel-next.patch -# make sure the lvds comes back on lid open -Patch1825: drm-intel-make-lvds-work.patch # hush the i915 fbc noise Patch1826: drm-i915-fbc-stfu.patch # rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069 @@ -1379,7 +1377,6 @@ ApplyOptionalPatch drm-nouveau-updates.patch # Intel DRM ApplyOptionalPatch drm-intel-next.patch -ApplyPatch drm-intel-make-lvds-work.patch ApplyPatch drm-i915-fbc-stfu.patch ApplyPatch drm-i915-sdvo-lvds-is-digital.patch @@ -2193,6 +2190,7 @@ fi %changelog * Tue Nov 29 2011 Josh Boyer - Add patch to fix deadlock in rtlwifi (rhbz #755154) +- Drop drm-intel-make-lvds-work.patch (rhbz #731296) * Mon Nov 28 2011 Chuck Ebbert 3.1.4-1 - Linux 3.1.4