diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-02-28 13:12:03 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-02-28 13:12:03 +0300 |
| commit | f074037a2eb1ff21e258a27a6270bae126ded062 (patch) | |
| tree | 06026bbe2f356f61a57cf420e0075a9986ad41e4 /drivers/gpu/drm/i915/gvt/dmabuf.c | |
| parent | 73c0fcac97bf7f4a6a61b825b205d1cf127cfca7 (diff) | |
| parent | b8a89f530f5692c70778c965f0bc8f5a61fbe703 (diff) | |
| download | linux-f074037a2eb1ff21e258a27a6270bae126ded062.tar.xz | |
Merge drm-next into drm-intel-next-queued
To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/dmabuf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/dmabuf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c index de3e076dcb31..9a471b0afb15 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.c +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c @@ -472,7 +472,6 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) ret = PTR_ERR(dmabuf); goto out_free_gem; } - obj->base.dma_buf = dmabuf; i915_gem_object_put(obj); |