summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-11-28 15:33:27 +1000
committerDave Airlie <airlied@gmail.com>2012-11-28 15:33:27 +1000
commit2d42839187b37f2eebe35dcac5c4a90c922c4ca4 (patch)
treec813e94eca51911de3e086b15919b4fb22a736aa
parent85e5aa0fb227077148cca34f644da054f0ba05a4 (diff)
qxl: fix primary mmap + use bo handles for relocs
-rw-r--r--src/qxl_kms.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qxl_kms.c b/src/qxl_kms.c
index d6dd82c..bf6f8fa 100644
--- a/src/qxl_kms.c
+++ b/src/qxl_kms.c
@@ -558,7 +558,7 @@ static struct qxl_bo *qxl_bo_create_primary(qxl_screen_t *qxl, struct QXLMode *m
return NULL;
bo->name = "surface memory";
- bo->size = stride * param.height + stride;
+ bo->size = stride * param.height;
bo->type = QXL_BO_SURF_PRIMARY;
bo->handle = param.handle;
bo->qxl = qxl;
@@ -690,7 +690,7 @@ static void qxl_bo_output_surf_reloc(qxl_screen_t *qxl, uint32_t dst_offset,
/* fix the kernel names */
r->reloc_type = QXL_RELOC_TYPE_SURF;
r->dst_handle = dst_bo->handle;
- r->src_handle = surf->id;
+ r->src_handle = bo->handle;
r->dst_offset = dst_offset;
r->src_offset = 0;
qxl->cmds.n_relocs++;