2010-11-02 17:06:42 +00:00
|
|
|
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/intel_display.c
|
2011-05-30 11:23:14 +00:00
|
|
|
@@ -5821,7 +5821,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
|
|
|
|
|
struct intel_load_detect_pipe *old)
|
2010-07-29 23:46:31 +00:00
|
|
|
{
|
2010-11-02 17:06:42 +00:00
|
|
|
struct drm_encoder *encoder = &intel_encoder->base;
|
2010-07-29 23:46:31 +00:00
|
|
|
- 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;
|
2011-05-30 11:23:14 +00:00
|
|
|
@@ -5832,7 +5831,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
|
|
|
|
|
|
|
|
|
|
if (old->load_detect_temp) {
|
2010-11-02 17:06:42 +00:00
|
|
|
connector->encoder = NULL;
|
2010-07-29 23:46:31 +00:00
|
|
|
- drm_helper_disable_unused_functions(dev);
|
|
|
|
|
|
2011-05-30 11:23:14 +00:00
|
|
|
if (old->release_fb)
|
|
|
|
|
old->release_fb->funcs->destroy(old->release_fb);
|
