diff options
author | Dave Airlie <airlied@redhat.com> | 2018-08-16 19:26:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-08-16 20:33:48 -0400 |
commit | 0258d7a5e261b3ce0d730f6f8f66f833058ce2b6 (patch) | |
tree | e7f369d5cffca2151284715f98501842694e18eb /drivers/gpu/drm/i915/gvt/cmd_parser.c | |
parent | 637319c67849baceea6ba466e62b70f9e674d85b (diff) | |
parent | 4795ac626a2fe5ce99ff788080ace343faf4c886 (diff) |
Merge tag 'drm-intel-next-fixes-2018-08-16-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Fixes for:
- DP full color range.
- selftest for gem_object
- forcewake on suspend
- GPU reset
This also include accumulated fixes from GVT:
- Fix an error code in gvt_dma_map_page() (Dan)
- Fix off by one error in intel_vgpu_write_fence() (Dan)
- Fix potential Spectre v1 (Gustavo)
- Fix workload free in vgpu release (Henry)
- Fix cleanup sequence in intel_gvt_clean_device (Henry)
- dmabuf mutex init place fix (Henry)
- possible memory leak in intel_vgpu_ioctl() err path (Yi)
- return error on cmd access check failure (Yan)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180816190335.GA7765@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 45e89b1e0481..a614db310ea2 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c | |||
@@ -874,7 +874,7 @@ static int cmd_reg_handler(struct parser_exec_state *s, | |||
874 | if (!intel_gvt_mmio_is_cmd_access(gvt, offset)) { | 874 | if (!intel_gvt_mmio_is_cmd_access(gvt, offset)) { |
875 | gvt_vgpu_err("%s access to non-render register (%x)\n", | 875 | gvt_vgpu_err("%s access to non-render register (%x)\n", |
876 | cmd, offset); | 876 | cmd, offset); |
877 | return 0; | 877 | return -EBADRQC; |
878 | } | 878 | } |
879 | 879 | ||
880 | if (is_shadowed_mmio(offset)) { | 880 | if (is_shadowed_mmio(offset)) { |