* [PATCH] drm/ttm: Handle in memory region copies
@ 2013-10-18 13:18 Jakob Bornecrantz
2013-10-30 7:52 ` Thomas Hellstrom
0 siblings, 1 reply; 2+ messages in thread
From: Jakob Bornecrantz @ 2013-10-18 13:18 UTC (permalink / raw)
To: dri-devel; +Cc: Jakob Bornecrantz, Dave Airlie, stable
Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 8be35c8..037f101 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -342,7 +342,9 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
if (old_iomap == NULL && ttm == NULL)
goto out2;
- if (ttm->state == tt_unpopulated) {
+ /* TTM might be null for moves within the same region.
+ */
+ if (ttm && ttm->state == tt_unpopulated) {
ret = ttm->bdev->driver->ttm_tt_populate(ttm);
if (ret) {
/* if we fail here don't nuke the mm node
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] drm/ttm: Handle in memory region copies
2013-10-18 13:18 [PATCH] drm/ttm: Handle in memory region copies Jakob Bornecrantz
@ 2013-10-30 7:52 ` Thomas Hellstrom
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Hellstrom @ 2013-10-30 7:52 UTC (permalink / raw)
To: Jakob Bornecrantz; +Cc: Dave Airlie, dri-devel
On 10/18/2013 03:18 PM, Jakob Bornecrantz wrote:
> Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
> Cc: Dave Airlie <airlied@redhat.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index 8be35c8..037f101 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -342,7 +342,9 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
> if (old_iomap == NULL && ttm == NULL)
> goto out2;
>
> - if (ttm->state == tt_unpopulated) {
> + /* TTM might be null for moves within the same region.
> + */
> + if (ttm && ttm->state == tt_unpopulated) {
> ret = ttm->bdev->driver->ttm_tt_populate(ttm);
> if (ret) {
> /* if we fail here don't nuke the mm node
LGTM. There are a couple of other fixes needed in this function as well.
/Thomas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-30 7:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-18 13:18 [PATCH] drm/ttm: Handle in memory region copies Jakob Bornecrantz
2013-10-30 7:52 ` Thomas Hellstrom
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).