]> 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)
commit0642a7f5ab03998277d15fb729febb7937412acc
tree91608878dc001b045000d1afc9c98cbb456821fd
parentb2db51a3d54eb1b9ff35b158e3a88c5d3d1bdb46
parent4dd0e1e72af43605d43b506f40bed811feff53e7
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