]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit99e425377290d94322e3c10a2efc2e9d3a7c1a79
tree91608878dc001b045000d1afc9c98cbb456821fd
parentd4c81fe8573c17c7d9b7b1cff906e2ad2e3c033e
parent0d17a4f817291d7eb55eb0198e3336c2a2e6f8b1
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