summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO3
-rw-r--r--drm-intel-make-lvds-work.patch18
-rw-r--r--kernel.spec4
3 files changed, 1 insertions, 24 deletions
diff --git a/TODO b/TODO
index 4bcf7e212..fef37aa87 100644
--- a/TODO
+++ b/TODO
@@ -51,9 +51,6 @@
* dmar-disable-when-ricoh-multifunction.patch
Added October 2010
-* drm-intel-make-lvds-work.patch
- Around since forever. Wtf ?
-
* linux-2.6-intel-iommu-igfx.patch
Invert igfx_off/igfx_on option. Around since forever. Upstreamable ?
Mustard ? Config option ?
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 5245c3250..7dd3adda4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -670,8 +670,6 @@ Patch1555: fix_xen_guest_on_old_EC2.patch
# nouveau + drm fixes
# 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
# rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
Patch1826: drm-i915-sdvo-lvds-is-digital.patch
@@ -1335,7 +1333,6 @@ ApplyPatch fix_xen_guest_on_old_EC2.patch
# Intel DRM
ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-intel-make-lvds-work.patch
ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch
@@ -2174,6 +2171,7 @@ fi
%changelog
* Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com>
- Add modules-extra subpackage
+- Drop drm-intel-make-lvds-work.patch (rhbz #731296)
* Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc3.git1.1
- Linux 3.2-rc3-git1