* [PATCH] drm/radeon: fix missing bo reservation
@ 2014-02-20 17:47 Christian König
2014-02-20 17:51 ` Alex Deucher
2014-02-21 21:26 ` Dieter Nützel
0 siblings, 2 replies; 4+ messages in thread
From: Christian König @ 2014-02-20 17:47 UTC (permalink / raw)
To: dri-devel
From: Christian König <christian.koenig@amd.com>
Otherwise we might get a crash here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 114d167..2aecd6d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
radeon_vm_init(rdev, &fpriv->vm);
+ r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
+ if (r)
+ return r;
+
/* map the ib pool buffer read only into
* virtual address space */
bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
@@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
RADEON_VM_PAGE_READABLE |
RADEON_VM_PAGE_SNOOPED);
+
+ radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
if (r) {
radeon_vm_fini(rdev, &fpriv->vm);
kfree(fpriv);
--
1.8.3.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix missing bo reservation
2014-02-20 17:47 [PATCH] drm/radeon: fix missing bo reservation Christian König
@ 2014-02-20 17:51 ` Alex Deucher
2014-02-21 21:26 ` Dieter Nützel
1 sibling, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2014-02-20 17:51 UTC (permalink / raw)
To: Christian König; +Cc: Maling list - DRI developers
On Thu, Feb 20, 2014 at 12:47 PM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Otherwise we might get a crash here.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: stable@vger.kernel.org
Good catch. Applied to my fixes tree.
Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index 114d167..2aecd6d 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
>
> radeon_vm_init(rdev, &fpriv->vm);
>
> + r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
> + if (r)
> + return r;
> +
> /* map the ib pool buffer read only into
> * virtual address space */
> bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
> @@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
> r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
> RADEON_VM_PAGE_READABLE |
> RADEON_VM_PAGE_SNOOPED);
> +
> + radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
> if (r) {
> radeon_vm_fini(rdev, &fpriv->vm);
> kfree(fpriv);
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix missing bo reservation
2014-02-20 17:47 [PATCH] drm/radeon: fix missing bo reservation Christian König
2014-02-20 17:51 ` Alex Deucher
@ 2014-02-21 21:26 ` Dieter Nützel
2014-02-21 22:22 ` Alex Deucher
1 sibling, 1 reply; 4+ messages in thread
From: Dieter Nützel @ 2014-02-21 21:26 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
Alex,
shouldn't you send a pull request, that this land in 3.14-rc4?
Just in case...
Thanks,
Dieter
Am 20.02.2014 18:47, schrieb Christian König:
> From: Christian König <christian.koenig@amd.com>
>
> Otherwise we might get a crash here.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c
> b/drivers/gpu/drm/radeon/radeon_kms.c
> index 114d167..2aecd6d 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device
> *dev, struct drm_file *file_priv)
>
> radeon_vm_init(rdev, &fpriv->vm);
>
> + r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
> + if (r)
> + return r;
> +
> /* map the ib pool buffer read only into
> * virtual address space */
> bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
> @@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev,
> struct drm_file *file_priv)
> r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
> RADEON_VM_PAGE_READABLE |
> RADEON_VM_PAGE_SNOOPED);
> +
> + radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
> if (r) {
> radeon_vm_fini(rdev, &fpriv->vm);
> kfree(fpriv);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix missing bo reservation
2014-02-21 21:26 ` Dieter Nützel
@ 2014-02-21 22:22 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2014-02-21 22:22 UTC (permalink / raw)
To: Dieter Nützel; +Cc: Dave Airlie, Maling list - DRI developers
On Fri, Feb 21, 2014 at 4:26 PM, Dieter Nützel <Dieter@nuetzel-hh.de> wrote:
> Alex,
>
> shouldn't you send a pull request, that this land in 3.14-rc4?
> Just in case...
I'll send a pull request next week along with any other patches I've
accumulated since the last pull. I usually try and send a -fixes pull
once a week assuming there are fixes that need to go in.
Alex
>
> Thanks,
> Dieter
>
> Am 20.02.2014 18:47, schrieb Christian König:
>>
>> From: Christian König <christian.koenig@amd.com>
>>
>> Otherwise we might get a crash here.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> Cc: stable@vger.kernel.org
>> ---
>> drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c
>> b/drivers/gpu/drm/radeon/radeon_kms.c
>> index 114d167..2aecd6d 100644
>> --- a/drivers/gpu/drm/radeon/radeon_kms.c
>> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
>> @@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device
>> *dev, struct drm_file *file_priv)
>>
>> radeon_vm_init(rdev, &fpriv->vm);
>>
>> + r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
>> + if (r)
>> + return r;
>> +
>> /* map the ib pool buffer read only into
>> * virtual address space */
>> bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
>> @@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev,
>> struct drm_file *file_priv)
>> r = radeon_vm_bo_set_addr(rdev, bo_va,
>> RADEON_VA_IB_OFFSET,
>> RADEON_VM_PAGE_READABLE |
>> RADEON_VM_PAGE_SNOOPED);
>> +
>> + radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
>> if (r) {
>> radeon_vm_fini(rdev, &fpriv->vm);
>> kfree(fpriv);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-21 22:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-20 17:47 [PATCH] drm/radeon: fix missing bo reservation Christian König
2014-02-20 17:51 ` Alex Deucher
2014-02-21 21:26 ` Dieter Nützel
2014-02-21 22:22 ` Alex Deucher
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.