diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
| commit | 32f35b863451884e856f0f577474740561a87fad (patch) | |
| tree | 2d1d55c7e2d23e27197bf84246c5f23070eb0fce /drivers/gpu/drm/i915/gvt/cmd_parser.c | |
| parent | ae7617f0ef1820be033eef93859a6bb6174a843f (diff) | |
| parent | 754270c7c56292e97d0eff924a5d5d83f92add07 (diff) | |
| download | linux-32f35b863451884e856f0f577474740561a87fad.tar.xz | |
Merge drm-upstream/drm-next into drm-intel-next-queued
Need MST sideband message transaction to power up/down nodes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 23a9bbbb6565..2c0ccbb817dc 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2725,7 +2725,7 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) unmap_src: i915_gem_object_unpin_map(obj); put_obj: - i915_gem_object_put(wa_ctx->indirect_ctx.obj); + i915_gem_object_put(obj); return ret; } |