Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8b3d3e authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Update load-detect failure paths for modeset-rework 



After the rework, intel_set_mode() became a little better behaved in
restoring the current mode if we failed to apply the requested modeline.
However, the failure path for load-detect would clobber the existing
state, leading to an oops during BIOS takeover on older machines.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0fed39bd

drivers/gpu/drm/i915/intel_display.c

+2 −7
Original line number Diff line number Diff line
@@ -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,