diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-27 11:43:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-27 11:43:17 +1000 |
| commit | ce485df43dc286f3ad96f9992b22e3974d051c44 (patch) | |
| tree | eb586142d3ba45378d0aa82b7fa75329e69bebb1 /drivers/gpu/drm/i915/gvt/cmd_parser.c | |
| parent | 522dbb354e8b6149d69244b4cf745a3222ddbb05 (diff) | |
| parent | 894e287b3dcc8bfc8d974f883dab3b5c66344089 (diff) | |
| download | linux-ce485df43dc286f3ad96f9992b22e3974d051c44.tar.gz linux-ce485df43dc286f3ad96f9992b22e3974d051c44.tar.xz | |
Merge tag 'drm-intel-fixes-2017-10-26' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
One fix for stable:
- fix perf enable/disable ioctls for 32bits (Lionel)
Plus GVT fixes:
- Fix per_ctx_bb check (Zhenyu)
- Fix GPU hang of Linux guest (Xion)
- Refine MMIO_RING_F to check for presence of VCS2 ring (Zhi)
* tag 'drm-intel-fixes-2017-10-26' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915/gvt: Adding ACTHD mmio read handler
drm/i915/gvt: Extract mmio_read_from_hw() common function
drm/i915/gvt: Refine MMIO_RING_F()
drm/i915/gvt: properly check per_ctx bb valid state
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 21c36e256884..d4726a3358a4 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2723,6 +2723,9 @@ static int combine_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) uint32_t per_ctx_start[CACHELINE_DWORDS] = {0}; unsigned char *bb_start_sva; + if (!wa_ctx->per_ctx.valid) + return 0; + per_ctx_start[0] = 0x18800001; per_ctx_start[1] = wa_ctx->per_ctx.guest_gma; |