From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling
Date: Thu, 16 Apr 2015 11:03:20 +0200 [thread overview]
Message-ID: <20150416090320.GK6092@phenom.ffwll.local> (raw)
In-Reply-To: <1429112399-5972-1-git-send-email-chris@chris-wilson.co.uk>
On Wed, Apr 15, 2015 at 04:39:59PM +0100, Chris Wilson wrote:
> Since the removal of the user pin_ioctl, the only means for pinning an
> object is either through binding to the scanout or during execbuf
> reservation. As the later prevents a call to set-tiling, we need only
> check if the obj is pinned into the display plane to see if we need
> reject the set-tiling ioctl.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
> index e1fa1d9aec6c..fd1b89a4d02d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
> @@ -338,7 +338,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
> }
>
> mutex_lock(&dev->struct_mutex);
> - if (i915_gem_obj_is_pinned(obj) || obj->framebuffer_references) {
> + if (obj->pin_display || obj->framebuffer_references) {
> ret = -EBUSY;
> goto err;
> }
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-04-16 9:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 15:39 [PATCH] drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling Chris Wilson
2015-04-16 4:55 ` shuang.he
2015-04-16 9:03 ` Daniel Vetter [this message]
2015-04-16 10:50 ` Chris Wilson
2015-04-16 14:08 ` Daniel Vetter
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=20150416090320.GK6092@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/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