---

yaml
---
r: 345295
b: refs/heads/master
c: 0e8b3d3
h: refs/heads/master
i:
  345293: ee49351
  345291: ac22f64
  345287: a780431
  345279: 461a9b4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fed39bd1d85bfd0d454cb7ba2aedab2f15141d5
+refs/heads/master: 0e8b3d3ea7c8f6e65c2c7220d64cbeb78023eff4

trunk/drivers/gpu/drm/i915/intel_display.c

@@ -6600,24 +6600,19 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
 		DRM_DEBUG_KMS("reusing fbdev for load-detection framebuffer\n");
 	if (IS_ERR(fb)) {
 		DRM_DEBUG_KMS("failed to allocate framebuffer for load-detection\n");
-		goto fail;
+		return false;
 	}
 
 	if (!intel_set_mode(crtc, mode, 0, 0, fb)) {
 		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
 		if (old->release_fb)
 			old->release_fb->funcs->destroy(old->release_fb);
-		goto fail;
+		return false;
 	}
 
 	/* let the connector get through one full cycle before testing */
 	intel_wait_for_vblank(dev, intel_crtc->pipe);
-
 	return true;
-fail:
-	connector->encoder = NULL;
-	encoder->crtc = NULL;
-	return false;
 }
 
 void intel_release_load_detect_pipe(struct drm_connector *connector,