rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Drop drm-intel-make-lvds-work.patch (rhbz #731296)

Browse Source 
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.
This commit is contained in:
Josh Boyer 2011-11-29 11:19:12 -05:00
parent b8b2783bb9
commit 5bd5546b84
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -51,9 +51,6 @@
* dmar-disable-when-ricoh-multifunction.patch * dmar-disable-when-ricoh-multifunction.patch
Added October 2010 Added October 2010
* drm-intel-make-lvds-work.patch
Around since forever. Wtf ?
* linux-2.6-intel-iommu-igfx.patch * linux-2.6-intel-iommu-igfx.patch
Invert igfx_off/igfx_on option. Around since forever. Upstreamable ? Invert igfx_off/igfx_on option. Around since forever. Upstreamable ?
Mustard ? Config option ? Mustard ? Config option ?

18
drm-intel-make-lvds-work.patch
View File

@ -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);

4
kernel.spec
View File

@ -670,8 +670,6 @@ Patch1555: fix_xen_guest_on_old_EC2.patch
# nouveau + drm fixes # nouveau + drm fixes
# intel drm is all merged upstream # intel drm is all merged upstream
Patch1824: drm-intel-next.patch 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 # rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
Patch1826: drm-i915-sdvo-lvds-is-digital.patch Patch1826: drm-i915-sdvo-lvds-is-digital.patch
@ -1335,7 +1333,6 @@ ApplyPatch fix_xen_guest_on_old_EC2.patch
# Intel DRM # Intel DRM
ApplyOptionalPatch drm-intel-next.patch ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-intel-make-lvds-work.patch
ApplyPatch drm-i915-sdvo-lvds-is-digital.patch ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch ApplyPatch linux-2.6-intel-iommu-igfx.patch
@ -2174,6 +2171,7 @@ fi
%changelog %changelog
* Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com> * Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com>
- Add modules-extra subpackage - 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 * Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc3.git1.1
- Linux 3.2-rc3-git1 - Linux 3.2-rc3-git1