[PATCH] drm/amdgpu: add sw_init to df_v1_7

[PATCH] drm/amdgpu: add sw_init to df_v1_7

[Kim, Jonathan]

add df sw init to df 1.7 function to prevent regression issues on pre-vega20
products.

Change-Id: I4941003ea4a99ba0ea736c7ecc8800148423c379
Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
index 9935371db7ce..335f2c02878f 100644
--- a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
@@ -33,6 +33,10 @@ static void df_v1_7_init (struct amdgpu_device *adev)
 {
 }
 
+static void df_v1_7_sw_init(struct amdgpu_device *adev)
+{
+}
+
 static void df_v1_7_enable_broadcast_mode(struct amdgpu_device *adev,
                                           bool enable)
 {
@@ -111,6 +115,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,
 
 const struct amdgpu_df_funcs df_v1_7_funcs = {
 	.init = df_v1_7_init,
+	.sw_init = df_v1_7_sw_init,
 	.enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
 	.get_fb_channel_number = df_v1_7_get_fb_channel_number,
 	.get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: add sw_init to df_v1_7

[Deucher, Alexander]

[-- Attachment #1.1: Type: text/plain, Size: 1900 bytes --]

If both init and sw_init are empty, we don't need both.  Just rename the init callback to sw_init.

Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Kim, Jonathan <Jonathan.Kim-5C7GfCeVMHo@public.gmane.org>
Sent: Friday, June 21, 2019 5:45 AM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Kim, Jonathan
Subject: [PATCH] drm/amdgpu: add sw_init to df_v1_7

add df sw init to df 1.7 function to prevent regression issues on pre-vega20
products.

Change-Id: I4941003ea4a99ba0ea736c7ecc8800148423c379
Signed-off-by: Jonathan Kim <Jonathan.Kim-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
index 9935371db7ce..335f2c02878f 100644
--- a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
@@ -33,6 +33,10 @@ static void df_v1_7_init (struct amdgpu_device *adev)
 {
 }

+static void df_v1_7_sw_init(struct amdgpu_device *adev)
+{
+}
+
 static void df_v1_7_enable_broadcast_mode(struct amdgpu_device *adev,
                                           bool enable)
 {
@@ -111,6 +115,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,

 const struct amdgpu_df_funcs df_v1_7_funcs = {
         .init = df_v1_7_init,
+       .sw_init = df_v1_7_sw_init,
         .enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
         .get_fb_channel_number = df_v1_7_get_fb_channel_number,
         .get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
--
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[-- Attachment #1.2: Type: text/html, Size: 3572 bytes --]

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

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amdgpu: add sw_init to df_v1_7

[Kim, Jonathan]

change df_init to df_sw_init df 1.7 to prevent regression issues on pre-vega20
products when callback is called in sw_common_sw_init.

Change-Id: I4941003ea4a99ba0ea736c7ecc8800148423c379
Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
index 9935371db7ce..844c03868248 100644
--- a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
@@ -29,7 +29,7 @@
 
 static u32 df_v1_7_channel_number[] = {1, 2, 0, 4, 0, 8, 0, 16, 2};
 
-static void df_v1_7_init (struct amdgpu_device *adev)
+static void df_v1_7_sw_init(struct amdgpu_device *adev)
 {
 }
 
@@ -110,7 +110,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,
 }
 
 const struct amdgpu_df_funcs df_v1_7_funcs = {
-	.init = df_v1_7_init,
+	.sw_init = df_v1_7_sw_init,
 	.enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
 	.get_fb_channel_number = df_v1_7_get_fb_channel_number,
 	.get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: add sw_init to df_v1_7

[Kuehling, Felix]

On 2019-06-21 11:31 a.m., Kim, Jonathan wrote:
> change df_init to df_sw_init df 1.7 to prevent regression issues on pre-vega20
> products when callback is called in sw_common_sw_init.
>
> Change-Id: I4941003ea4a99ba0ea736c7ecc8800148423c379
> Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

So your previous patch broke the build. Please at least build test your 
code before you push. Breaking the build is not acceptable. It slows 
down everybody else. I'll take a look if anything else can be cleaned up 
with these callbacks later.


> ---
>   drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> index 9935371db7ce..844c03868248 100644
> --- a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> @@ -29,7 +29,7 @@
>   
>   static u32 df_v1_7_channel_number[] = {1, 2, 0, 4, 0, 8, 0, 16, 2};
>   
> -static void df_v1_7_init (struct amdgpu_device *adev)
> +static void df_v1_7_sw_init(struct amdgpu_device *adev)
>   {
>   }
>   
> @@ -110,7 +110,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,
>   }
>   
>   const struct amdgpu_df_funcs df_v1_7_funcs = {
> -	.init = df_v1_7_init,
> +	.sw_init = df_v1_7_sw_init,
>   	.enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
>   	.get_fb_channel_number = df_v1_7_get_fb_channel_number,
>   	.get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu: add sw_init to df_v1_7

[Kim, Jonathan]

Thanks, sorry about this.  I'll be more thorough next time.  Patch verified with vega20 and vega10 systems.

Jon

-----Original Message-----
From: Kuehling, Felix <Felix.Kuehling@amd.com> 
Sent: Friday, June 21, 2019 12:10 PM
To: amd-gfx@lists.freedesktop.org; Kim, Jonathan <Jonathan.Kim@amd.com>
Subject: Re: [PATCH] drm/amdgpu: add sw_init to df_v1_7

On 2019-06-21 11:31 a.m., Kim, Jonathan wrote:
> change df_init to df_sw_init df 1.7 to prevent regression issues on 
> pre-vega20 products when callback is called in sw_common_sw_init.
>
> Change-Id: I4941003ea4a99ba0ea736c7ecc8800148423c379
> Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

So your previous patch broke the build. Please at least build test your code before you push. Breaking the build is not acceptable. It slows down everybody else. I'll take a look if anything else can be cleaned up with these callbacks later.


> ---
>   drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c 
> b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> index 9935371db7ce..844c03868248 100644
> --- a/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> @@ -29,7 +29,7 @@
>   
>   static u32 df_v1_7_channel_number[] = {1, 2, 0, 4, 0, 8, 0, 16, 2};
>   
> -static void df_v1_7_init (struct amdgpu_device *adev)
> +static void df_v1_7_sw_init(struct amdgpu_device *adev)
>   {
>   }
>   
> @@ -110,7 +110,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,
>   }
>   
>   const struct amdgpu_df_funcs df_v1_7_funcs = {
> -	.init = df_v1_7_init,
> +	.sw_init = df_v1_7_sw_init,
>   	.enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
>   	.get_fb_channel_number = df_v1_7_get_fb_channel_number,
>   	.get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx