[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20130729125851.a4b10b1fe06303772afd74b0@canb.auug.org.au>
Date: Mon, 29 Jul 2013 12:58:51 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Airlie <airlied@...ux.ie>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Herrmann <dh.herrmann@...il.com>
Subject: linux-next: manual merge of the drm tree with Linus' tree
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/qxl/qxl_release.c between commit 8002db6336dd ("qxl:
convert qxl driver to proper use for reservations") from Linus' tree and
commit 72525b3f333d ("drm/ttm: convert to unified vma offset manager")
from the drm tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/gpu/drm/qxl/qxl_release.c
index b61449e,1a648e1..0000000
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@@ -85,13 -85,12 +85,13 @@@ qxl_release_free(struct qxl_device *qde
if (release->surface_release_id)
qxl_surface_id_dealloc(qdev, release->surface_release_id);
- for (i = 0 ; i < release->bo_count; ++i) {
+ list_for_each_entry_safe(entry, tmp, &release->bos, tv.head) {
+ struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
QXL_INFO(qdev, "release %llx\n",
- entry->tv.bo->addr_space_offset
- drm_vma_node_offset_addr(&release->bos[i]->tbo.vma_node)
++ drm_vma_node_offset_addr(&entry->tv.bo->vma_node)
- DRM_FILE_OFFSET);
- qxl_fence_remove_release(&release->bos[i]->fence, release->id);
- qxl_bo_unref(&release->bos[i]);
+ qxl_fence_remove_release(&bo->fence, release->id);
+ qxl_bo_unref(&bo);
}
spin_lock(&qdev->release_idr_lock);
idr_remove(&qdev->release_idr, release->id);
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists