From: Thomas Hellstrom <thellstrom@vmware.com>
To: Jakob Bornecrantz <jakob@vmware.com>
Cc: Dave Airlie <airlied@redhat.com>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/ttm: Handle in memory region copies
Date: Wed, 30 Oct 2013 08:52:20 +0100 [thread overview]
Message-ID: <5270BAB4.1010806@vmware.com> (raw)
In-Reply-To: <1382102289-23664-1-git-send-email-jakob@vmware.com>
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
prev parent reply other threads:[~2013-10-30 7:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 13:18 [PATCH] drm/ttm: Handle in memory region copies Jakob Bornecrantz
2013-10-30 7:52 ` Thomas Hellstrom [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5270BAB4.1010806@vmware.com \
--to=thellstrom@vmware.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jakob@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).