Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b0b20ce347b66a705943628ec0cc9e0a30eb785e

Authored by Dave Airlie
2 parents 4afb153477 13a7a6ac0a
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 2 changed files Side-by-side Diff

1 1 VERSION = 4
2 2 PATCHLEVEL = 0
3 3 SUBLEVEL = 0
4   -EXTRAVERSION = -rc1
  4 +EXTRAVERSION = -rc2
5 5 NAME = Hurr durr I'ma sheep
6 6  
7 7 # *DOCUMENTATION*
drivers/gpu/drm/i915/intel_display.c
Diff comments   View file @ b0b20ce
... ... @@ -8713,6 +8713,7 @@
8713 8713 old->release_fb->funcs->destroy(old->release_fb);
8714 8714 goto fail;
8715 8715 }
  8716 + crtc->primary->crtc = crtc;
8716 8717  
8717 8718 /* let the connector get through one full cycle before testing */
8718 8719 intel_wait_for_vblank(dev, intel_crtc->pipe);