Merge tag 'drm-intel-next-2018-06-06' into gvt-next
authorZhenyu Wang <zhenyuw@linux.intel.com>
Thu, 7 Jun 2018 02:24:50 +0000 (10:24 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Thu, 7 Jun 2018 02:24:50 +0000 (10:24 +0800)
commit0766e2efc6968179ceec9828caf740ec0ac58a15
tree91608878dc001b045000d1afc9c98cbb456821fd
parent9a512e23f173a3598709b74d6ccf9a6616403967
parent14c3f8425080a1ff97df7b81f7c339bf42c427a3
Merge tag 'drm-intel-next-2018-06-06' into gvt-next

Backmerge for recent request->hw_context change and
new vGPU huge page capability definition.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/display.c
drivers/gpu/drm/i915/gvt/fb_decoder.c
drivers/gpu/drm/i915/gvt/gvt.h
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/i915_pvinfo.h