diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-19 04:07:14 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 04:07:14 +0300 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /drivers/gpu/drm/i915/gvt/execlist.c | |
| parent | a6a5c983b35e579071370d4eb2b4ed8ad5c18da9 (diff) | |
| parent | 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 (diff) | |
| download | linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/execlist.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/execlist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c index ce4276a7cf9c..536bde8638c8 100644 --- a/drivers/gpu/drm/i915/gvt/execlist.c +++ b/drivers/gpu/drm/i915/gvt/execlist.c @@ -776,7 +776,8 @@ static void init_vgpu_execlist(struct intel_vgpu *vgpu, int ring_id) _EL_OFFSET_STATUS_PTR); ctx_status_ptr.dw = vgpu_vreg(vgpu, ctx_status_ptr_reg); - ctx_status_ptr.read_ptr = ctx_status_ptr.write_ptr = 0x7; + ctx_status_ptr.read_ptr = 0; + ctx_status_ptr.write_ptr = 0x7; vgpu_vreg(vgpu, ctx_status_ptr_reg) = ctx_status_ptr.dw; } |