From f6c7bdfaf4debca49bd42e771fbc39aba75d2ebb Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 5 Nov 2012 22:25:08 +0000 Subject: [PATCH] --- yaml --- r: 345295 b: refs/heads/master c: 0e8b3d3ea7c8f6e65c2c7220d64cbeb78023eff4 h: refs/heads/master i: 345293: ee49351080454500f96e2737478b7859698b4408 345291: ac22f64e185395762f095ce21dd641dee388a57b 345287: a780431ce9d096bd01a950f366d459fc33990cdd 345279: 461a9b44a72a6768103f8bd00c56e18d11bd8d43 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2f72d8bf2f2f..5ed115e6b487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fed39bd1d85bfd0d454cb7ba2aedab2f15141d5 +refs/heads/master: 0e8b3d3ea7c8f6e65c2c7220d64cbeb78023eff4 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 029e008979b6..6d8a5edb1fa7 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/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,