Merge tag 'drm-intel-next-2019-04-04' into gvt-next
authorZhenyu Wang <zhenyuw@linux.intel.com>
Tue, 16 Apr 2019 08:50:34 +0000 (16:50 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Tue, 16 Apr 2019 08:50:34 +0000 (16:50 +0800)
commit95d002e0a34cb0f238abb39987f9980f325d8332
treeb8ed70572a55b4e67410f906159f86e8aabb0f6a
parentd57b39e3ee3cdb4b00452090e386d197980cefc9
parent28d618e9ab86f26a31af0b235ced55beb3e343c8
Merge tag 'drm-intel-next-2019-04-04' into gvt-next

Merge back drm-intel-next for engine name definition refinement
and 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than addresses")
that would need gvt fixes to depend on.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/cmd_parser.c
drivers/gpu/drm/i915/gvt/gtt.c
drivers/gpu/drm/i915/gvt/gvt.h
drivers/gpu/drm/i915/gvt/handlers.c