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

Commit b0b20ce3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v4.0-rc2' into drm-fixes 

Linux 4.0-rc2

Merging this manually as the i915 change is in it,
and intel fixes are on top of this
parents 4afb1534 13a7a6ac

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

drivers/gpu/drm/i915/intel_display.c

+1 −0
Original line number Diff line number Diff line
@@ -8713,6 +8713,7 @@ retry: 
			old->release_fb->funcs->destroy(old->release_fb);

		goto fail;

	}

	crtc->primary->crtc = crtc;



	/* let the connector get through one full cycle before testing */

	intel_wait_for_vblank(dev, intel_crtc->pipe);