* [PATCH] drm/amdgpu: fix the missing braces
@ 2020-03-25 15:39 Huang Rui
2020-03-25 15:47 ` Nirmoy
0 siblings, 1 reply; 3+ messages in thread
From: Huang Rui @ 2020-03-25 15:39 UTC (permalink / raw)
To: amd-gfx; +Cc: Huang Rui
The braces are missed around amdgpu_ttm_training_reserve_vram_init().
Signed-off-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index b397148..8afe62a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1938,10 +1938,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
*The reserved vram for memory training must be pinned to the specified
*place on the VRAM, so reserve it early.
*/
- if (!amdgpu_sriov_vf(adev))
+ if (!amdgpu_sriov_vf(adev)) {
r = amdgpu_ttm_training_reserve_vram_init(adev);
if (r)
return r;
+ }
/* allocate memory as required for VGA
* This is used for VGA emulation and pre-OS scanout buffers to
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix the missing braces
2020-03-25 15:39 [PATCH] drm/amdgpu: fix the missing braces Huang Rui
@ 2020-03-25 15:47 ` Nirmoy
2020-03-26 3:07 ` Huang Rui
0 siblings, 1 reply; 3+ messages in thread
From: Nirmoy @ 2020-03-25 15:47 UTC (permalink / raw)
To: Huang Rui, amd-gfx
Hi Ray,
I pushed a fix few minutes ago :)
Regards,
Nirmoy
On 3/25/20 4:39 PM, Huang Rui wrote:
> The braces are missed around amdgpu_ttm_training_reserve_vram_init().
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index b397148..8afe62a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1938,10 +1938,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
> *The reserved vram for memory training must be pinned to the specified
> *place on the VRAM, so reserve it early.
> */
> - if (!amdgpu_sriov_vf(adev))
> + if (!amdgpu_sriov_vf(adev)) {
> r = amdgpu_ttm_training_reserve_vram_init(adev);
> if (r)
> return r;
> + }
>
> /* allocate memory as required for VGA
> * This is used for VGA emulation and pre-OS scanout buffers to
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix the missing braces
2020-03-25 15:47 ` Nirmoy
@ 2020-03-26 3:07 ` Huang Rui
0 siblings, 0 replies; 3+ messages in thread
From: Huang Rui @ 2020-03-26 3:07 UTC (permalink / raw)
To: Das, Nirmoy; +Cc: amd-gfx
On Wed, Mar 25, 2020 at 11:47:08PM +0800, Das, Nirmoy wrote:
> Hi Ray,
>
> I pushed a fix few minutes ago :)
>
No problem, that's fine. I should have looked at the mail list firstly.
Thanks,
Ray
>
> Regards,
>
> Nirmoy
>
> On 3/25/20 4:39 PM, Huang Rui wrote:
> > The braces are missed around amdgpu_ttm_training_reserve_vram_init().
> >
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > index b397148..8afe62a 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > @@ -1938,10 +1938,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
> > *The reserved vram for memory training must be pinned to the specified
> > *place on the VRAM, so reserve it early.
> > */
> > - if (!amdgpu_sriov_vf(adev))
> > + if (!amdgpu_sriov_vf(adev)) {
> > r = amdgpu_ttm_training_reserve_vram_init(adev);
> > if (r)
> > return r;
> > + }
> >
> > /* allocate memory as required for VGA
> > * This is used for VGA emulation and pre-OS scanout buffers to
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-26 3:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 15:39 [PATCH] drm/amdgpu: fix the missing braces Huang Rui
2020-03-25 15:47 ` Nirmoy
2020-03-26 3:07 ` Huang Rui
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).