On 10/18/2013 03:18 PM, Jakob Bornecrantz wrote:
> Reviewed-by: Thomas Hellstr?m <thellstrom at vmware.com>
> Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>
> Cc: Dave Airlie <airlied at redhat.com>
> Cc: dri-devel at lists.freedesktop.org
> Cc: stable at 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
