2010-11-16 05:19:59 +00:00
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
|
|
|
index 0cece04..63bbb4b 100644
|
|
|
|
|
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
|
|
|
@@ -4580,7 +4580,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
|
|
|
|
|
struct drm_connector *connector, int dpms_mode)
|
2010-07-29 23:46:31 +00:00
|
|
|
{
|
2010-11-16 05:19:59 +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;
|
2010-11-16 05:19:59 +00:00
|
|
|
@@ -4590,7 +4589,6 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
|
|
|
|
|
connector->encoder = NULL;
|
2010-07-29 23:46:31 +00:00
|
|
|
intel_encoder->load_detect_temp = false;
|
|
|
|
|
crtc->enabled = drm_helper_crtc_in_use(crtc);
|
|
|
|
|
- drm_helper_disable_unused_functions(dev);
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-16 05:19:59 +00:00
|
|
|
/* Switch crtc and encoder back off if necessary */
|
