All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] intel: Mark bo's exported to prime as not reusable
@ 2012-09-14 20:37 Kristian Høgsberg
  2012-09-14 20:40 ` Chris Wilson
  0 siblings, 1 reply; 5+ messages in thread
From: Kristian Høgsberg @ 2012-09-14 20:37 UTC (permalink / raw)
  To: dri-devel

It's the same situation as flink and we need take the same pre-cautions.
---
 intel/intel_bufmgr_gem.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 3bcc849..92c0444 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2472,8 +2472,14 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
+	int ret;
 
-	return drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle, DRM_CLOEXEC, prime_fd);
+	ret = drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
+				 DRM_CLOEXEC, prime_fd);
+	if (ret == 0)
+		bo_gem->reusable = false;
+
+	return ret;
 }
 
 static int
-- 
1.7.10.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] intel: Mark bo's exported to prime as not reusable
  2012-09-14 20:37 [PATCH] intel: Mark bo's exported to prime as not reusable Kristian Høgsberg
@ 2012-09-14 20:40 ` Chris Wilson
  2012-09-14 21:01   ` Kristian Høgsberg
  0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2012-09-14 20:40 UTC (permalink / raw)
  To: dri-devel

[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]

On Fri, 14 Sep 2012 16:37:53 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
> It's the same situation as flink and we need take the same pre-cautions.
> ---
>  intel/intel_bufmgr_gem.c |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
> index 3bcc849..92c0444 100644
> --- a/intel/intel_bufmgr_gem.c
> +++ b/intel/intel_bufmgr_gem.c
> @@ -2472,8 +2472,14 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
>  {
>  	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
>  	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
> +	int ret;
>  
> -	return drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle, DRM_CLOEXEC, prime_fd);
> +	ret = drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
> +				 DRM_CLOEXEC, prime_fd);
> +	if (ret == 0)
> +		bo_gem->reusable = false;

Now that you mention it... 
To be consistent with libdrm_intel, we should return -errno on error; so
rephrasing this as
  if (ret)
    return -errno;

  bo_gem->reusable = false;
  return 0;

would work better.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] intel: Mark bo's exported to prime as not reusable
  2012-09-14 20:40 ` Chris Wilson
@ 2012-09-14 21:01   ` Kristian Høgsberg
  2012-09-14 21:03     ` Chris Wilson
  0 siblings, 1 reply; 5+ messages in thread
From: Kristian Høgsberg @ 2012-09-14 21:01 UTC (permalink / raw)
  To: Chris Wilson; +Cc: dri-devel

On Fri, Sep 14, 2012 at 4:40 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, 14 Sep 2012 16:37:53 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
>> It's the same situation as flink and we need take the same pre-cautions.
>> ---
>>  intel/intel_bufmgr_gem.c |    8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
>> index 3bcc849..92c0444 100644
>> --- a/intel/intel_bufmgr_gem.c
>> +++ b/intel/intel_bufmgr_gem.c
>> @@ -2472,8 +2472,14 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
>>  {
>>       drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
>>       drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
>> +     int ret;
>>
>> -     return drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle, DRM_CLOEXEC, prime_fd);
>> +     ret = drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
>> +                              DRM_CLOEXEC, prime_fd);
>> +     if (ret == 0)
>> +             bo_gem->reusable = false;
>
> Now that you mention it...
> To be consistent with libdrm_intel, we should return -errno on error; so
> rephrasing this as
>   if (ret)
>     return -errno;
>
>   bo_gem->reusable = false;
>   return 0;
>
> would work better.

Argh, yes, I copy and pasted that from drm_intel_gem_bo_flink() but
edited it away later...  with that change, can I add your reviewed-by
and commit?

Kristian
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] intel: Mark bo's exported to prime as not reusable
  2012-09-14 21:01   ` Kristian Høgsberg
@ 2012-09-14 21:03     ` Chris Wilson
  2012-09-15  2:12       ` Kristian Høgsberg
  0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2012-09-14 21:03 UTC (permalink / raw)
  Cc: dri-devel

[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]

On Fri, 14 Sep 2012 17:01:18 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
> On Fri, Sep 14, 2012 at 4:40 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > On Fri, 14 Sep 2012 16:37:53 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
> >> It's the same situation as flink and we need take the same pre-cautions.
> >> ---
> >>  intel/intel_bufmgr_gem.c |    8 +++++++-
> >>  1 file changed, 7 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
> >> index 3bcc849..92c0444 100644
> >> --- a/intel/intel_bufmgr_gem.c
> >> +++ b/intel/intel_bufmgr_gem.c
> >> @@ -2472,8 +2472,14 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
> >>  {
> >>       drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
> >>       drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
> >> +     int ret;
> >>
> >> -     return drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle, DRM_CLOEXEC, prime_fd);
> >> +     ret = drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
> >> +                              DRM_CLOEXEC, prime_fd);
> >> +     if (ret == 0)
> >> +             bo_gem->reusable = false;
> >
> > Now that you mention it...
> > To be consistent with libdrm_intel, we should return -errno on error; so
> > rephrasing this as
> >   if (ret)
> >     return -errno;
> >
> >   bo_gem->reusable = false;
> >   return 0;
> >
> > would work better.
> 
> Argh, yes, I copy and pasted that from drm_intel_gem_bo_flink() but
> edited it away later...  with that change, can I add your reviewed-by
> and commit?

Yes,

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] intel: Mark bo's exported to prime as not reusable
  2012-09-14 21:03     ` Chris Wilson
@ 2012-09-15  2:12       ` Kristian Høgsberg
  0 siblings, 0 replies; 5+ messages in thread
From: Kristian Høgsberg @ 2012-09-15  2:12 UTC (permalink / raw)
  To: Chris Wilson; +Cc: dri-devel

On Fri, Sep 14, 2012 at 5:03 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, 14 Sep 2012 17:01:18 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
>> On Fri, Sep 14, 2012 at 4:40 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> > On Fri, 14 Sep 2012 16:37:53 -0400, Kristian Høgsberg <krh@bitplanet.net> wrote:
>> >> It's the same situation as flink and we need take the same pre-cautions.
>> >> ---
>> >>  intel/intel_bufmgr_gem.c |    8 +++++++-
>> >>  1 file changed, 7 insertions(+), 1 deletion(-)
>> >>
>> >> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
>> >> index 3bcc849..92c0444 100644
>> >> --- a/intel/intel_bufmgr_gem.c
>> >> +++ b/intel/intel_bufmgr_gem.c
>> >> @@ -2472,8 +2472,14 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
>> >>  {
>> >>       drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
>> >>       drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
>> >> +     int ret;
>> >>
>> >> -     return drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle, DRM_CLOEXEC, prime_fd);
>> >> +     ret = drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
>> >> +                              DRM_CLOEXEC, prime_fd);
>> >> +     if (ret == 0)
>> >> +             bo_gem->reusable = false;
>> >
>> > Now that you mention it...
>> > To be consistent with libdrm_intel, we should return -errno on error; so
>> > rephrasing this as
>> >   if (ret)
>> >     return -errno;
>> >
>> >   bo_gem->reusable = false;
>> >   return 0;
>> >
>> > would work better.
>>
>> Argh, yes, I copy and pasted that from drm_intel_gem_bo_flink() but
>> edited it away later...  with that change, can I add your reviewed-by
>> and commit?
>
> Yes,
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris

Thanks, pushed.  Btw, before this patch,
drm_intel_bo_gem_export_to_prime() was actually just returning the
drmPrimeHandleToFD() return value directly, not -errno on error.

Kristian
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-15  2:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 20:37 [PATCH] intel: Mark bo's exported to prime as not reusable Kristian Høgsberg
2012-09-14 20:40 ` Chris Wilson
2012-09-14 21:01   ` Kristian Høgsberg
2012-09-14 21:03     ` Chris Wilson
2012-09-15  2:12       ` Kristian Høgsberg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.