diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-05-30 07:23:14 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-05-30 07:23:14 -0400 |
| commit | 123d535ad8de98fe5fd368bea098100171fdfb97 (patch) | |
| tree | 519e4e355539a65ca27c0321f3af048874314d4d /drm-intel-make-lvds-work.patch | |
| parent | cbc61c988b303e7718d0e711e1c506b0700042f4 (diff) | |
| download | kernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.gz kernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.xz kernel-123d535ad8de98fe5fd368bea098100171fdfb97.zip | |
rebase and nuke patches
Diffstat (limited to 'drm-intel-make-lvds-work.patch')
| -rw-r--r-- | drm-intel-make-lvds-work.patch | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drm-intel-make-lvds-work.patch b/drm-intel-make-lvds-work.patch index 209deb295..89f4e2d48 100644 --- a/drm-intel-make-lvds-work.patch +++ b/drm-intel-make-lvds-work.patch @@ -1,23 +1,18 @@ - drivers/gpu/drm/i915/intel_display.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 990f065..171a797 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -4568,7 +4568,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, - struct drm_connector *connector, int dpms_mode) +@@ -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; -@@ -4578,7 +4577,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, +@@ -5832,7 +5831,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, + + if (old->load_detect_temp) { connector->encoder = NULL; - intel_encoder->load_detect_temp = false; - crtc->enabled = drm_helper_crtc_in_use(crtc); - drm_helper_disable_unused_functions(dev); - } - /* Switch crtc and encoder back off if necessary */ + if (old->release_fb) + old->release_fb->funcs->destroy(old->release_fb); |