drm/amdgpu: add sw_init to df_v1_7

Submitted by Kim, Jonathan on June 21, 2019, 3:31 p.m.

Details

Message ID 20190621153054.88153-1-jonathan.kim@amd.com
State Accepted
Commit 8f78f1b03eb2f4e574a638ef648cf3db0990b303
Headers show
Series "drm/amdgpu: add sw_init to df_v1_7" ( rev: 3 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Kim, Jonathan June 21, 2019, 3:31 p.m.
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(-)

-- 
2.17.1

Patch hide | download patch | download mbox

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,

Comments

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,
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,