Commit 47e7f506 authored by Rob Clark's avatar Rob Clark Committed by Sean Paul

drm/msm: fix handling of cmdstream offset

Userspace hasn't used submit cmds with submit_offset != 0 for a while,
but this starts cropping up again with cmdstream sub-buffer-allocation
in libdrm_freedreno.

Doesn't do much good to increment the buf ptr before assigning it.

Fixes: 78b8e5b8 drm/msm: dump a rd GPUADDR header for all buffers in the command
Reviewed-by: default avatarKristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parent 51270de9
...@@ -316,10 +316,11 @@ static void snapshot_buf(struct msm_rd_state *rd, ...@@ -316,10 +316,11 @@ static void snapshot_buf(struct msm_rd_state *rd,
uint64_t iova, uint32_t size) uint64_t iova, uint32_t size)
{ {
struct msm_gem_object *obj = submit->bos[idx].obj; struct msm_gem_object *obj = submit->bos[idx].obj;
unsigned offset = 0;
const char *buf; const char *buf;
if (iova) { if (iova) {
buf += iova - submit->bos[idx].iova; offset = iova - submit->bos[idx].iova;
} else { } else {
iova = submit->bos[idx].iova; iova = submit->bos[idx].iova;
size = obj->base.size; size = obj->base.size;
...@@ -340,6 +341,8 @@ static void snapshot_buf(struct msm_rd_state *rd, ...@@ -340,6 +341,8 @@ static void snapshot_buf(struct msm_rd_state *rd,
if (IS_ERR(buf)) if (IS_ERR(buf))
return; return;
buf += offset;
rd_write_section(rd, RD_BUFFER_CONTENTS, buf, size); rd_write_section(rd, RD_BUFFER_CONTENTS, buf, size);
msm_gem_put_vaddr(&obj->base); msm_gem_put_vaddr(&obj->base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment