diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
| commit | 3732ce72b45a2a145803558758821bf198751276 (patch) | |
| tree | 75047ed1f43cfd56231535c401924dbb27c4d0f0 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | e829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8
Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 5bc0ce1347ce..72e0edd7bbde 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1003,6 +1003,8 @@ static int intel_lr_context_pin(struct drm_i915_gem_request *rq) ret = intel_pin_and_map_ringbuffer_obj(ring->dev, ringbuf); if (ret) goto unpin_ctx_obj; + + ctx_obj->dirty = true; } return ret; |