linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Stephen Rothwell
2015-09-24T01:25:16Z

drivers/gpu/drm/i915/intel_display.c

between commit:

721a09f7393d ("drm/i915: Add primary plane to mask if it's visible")

from the drm-intel-fixes tree and commit:

f9cd7b881a04 ("drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()")

from the drm-intel tree.

I fixed it up (I have no idea what do to here, so I just used the version
from the drm-intel tree) and can carry the fix as necessary (no action
is required - unless there is a better fix).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org