Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 5cb65bf

Browse files
committed
Merge remote-tracking branch 'origin/gvt-next' into gvt-staging
2 parents 213c2f0 + e00db7c commit 5cb65bf

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/gpu/drm/i915/gvt/gvt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ struct intel_gvt_mmio {
255255
#define F_CMD_ACCESS (1 << 3)
256256
/* This reg has been accessed by a VM */
257257
#define F_ACCESSED (1 << 4)
258-
/* This reg has been accessed through GPU commands */
258+
/* This reg could be accessed by unaligned address */
259259
#define F_UNALIGN (1 << 6)
260260
/* This reg is in GVT's mmio save-restor list and in hardware
261261
* logical context image

drivers/gpu/drm/i915/gvt/handlers.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,8 @@ static int hws_pga_write(struct intel_vgpu *vgpu, unsigned int offset,
14891489
const struct intel_engine_cs *engine =
14901490
intel_gvt_render_mmio_to_engine(vgpu->gvt, offset);
14911491

1492-
if (!intel_gvt_ggtt_validate_range(vgpu, value, I915_GTT_PAGE_SIZE)) {
1492+
if (value != 0 &&
1493+
!intel_gvt_ggtt_validate_range(vgpu, value, I915_GTT_PAGE_SIZE)) {
14931494
gvt_vgpu_err("write invalid HWSP address, reg:0x%x, value:0x%x\n",
14941495
offset, value);
14951496
return -EINVAL;

0 commit comments

Comments
 (0)