drm/amdgpu/si: remove unused interface which caused build issue

Submitted by Huang, Ray on Sept. 19, 2016, 8:11 a.m.

Details

Message ID 1474272705-32265-1-git-send-email-ray.huang@amd.com
State New
Headers show
Series "drm/amdgpu/si: remove unused interface which caused build issue" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Huang, Ray Sept. 19, 2016, 8:11 a.m.
From: Huang Rui <Ray.Huang@amd.com>

Fix commit (ed22ee2 drm/amdgpu:changes of virtualization cases probe)
regression, remove si_get_virtual_caps because the callback is removed
at amdgpu_asic_funcs.

Signed-off-by: Huang Rui <Ray.Huang@amd.com>
Cc: Monk Liu <Monk.Liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/si.c | 7 -------
 1 file changed, 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index fee76b8..a0b6b7e 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -952,12 +952,6 @@  static void si_smc_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);
 }
 
-static u32 si_get_virtual_caps(struct amdgpu_device *adev)
-{
-	/* SI does not support SR-IOV */
-	return 0;
-}
-
 static struct amdgpu_allowed_register_entry si_allowed_read_registers[] = {
 	{GRBM_STATUS, false},
 	{GB_ADDR_CONFIG, false},
@@ -1133,7 +1127,6 @@  static const struct amdgpu_asic_funcs si_asic_funcs =
 	.get_xclk = &si_get_xclk,
 	.set_uvd_clocks = &si_set_uvd_clocks,
 	.set_vce_clocks = NULL,
-	.get_virtual_caps = &si_get_virtual_caps,
 };
 
 static uint32_t si_get_rev_id(struct amdgpu_device *adev)

Comments

Am 19.09.2016 um 10:11 schrieb Huang Rui:
> From: Huang Rui <Ray.Huang@amd.com>
>
> Fix commit (ed22ee2 drm/amdgpu:changes of virtualization cases probe)
> regression, remove si_get_virtual_caps because the callback is removed
> at amdgpu_asic_funcs.
>
> Signed-off-by: Huang Rui <Ray.Huang@amd.com>
> Cc: Monk Liu <Monk.Liu@amd.com>

Patch is Reviewed-by: Christian K├Ânig <christian.koenig@amd.com>.

Please always build with all HW generations enabled to catch such errors.

Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/si.c | 7 -------
>   1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
> index fee76b8..a0b6b7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si.c
> @@ -952,12 +952,6 @@ static void si_smc_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
>   	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);
>   }
>   
> -static u32 si_get_virtual_caps(struct amdgpu_device *adev)
> -{
> -	/* SI does not support SR-IOV */
> -	return 0;
> -}
> -
>   static struct amdgpu_allowed_register_entry si_allowed_read_registers[] = {
>   	{GRBM_STATUS, false},
>   	{GB_ADDR_CONFIG, false},
> @@ -1133,7 +1127,6 @@ static const struct amdgpu_asic_funcs si_asic_funcs =
>   	.get_xclk = &si_get_xclk,
>   	.set_uvd_clocks = &si_set_uvd_clocks,
>   	.set_vce_clocks = NULL,
> -	.get_virtual_caps = &si_get_virtual_caps,
>   };
>   
>   static uint32_t si_get_rev_id(struct amdgpu_device *adev)
On Mon, Sep 19, 2016 at 04:31:18PM +0800, Koenig, Christian wrote:
> Am 19.09.2016 um 10:11 schrieb Huang Rui:
> > From: Huang Rui <Ray.Huang@amd.com>
> >
> > Fix commit (ed22ee2 drm/amdgpu:changes of virtualization cases probe)
> > regression, remove si_get_virtual_caps because the callback is removed
> > at amdgpu_asic_funcs.
> >
> > Signed-off-by: Huang Rui <Ray.Huang@amd.com>
> > Cc: Monk Liu <Monk.Liu@amd.com>
> 
> Patch is Reviewed-by: Christian K?nig <christian.koenig@amd.com>.
> 
> Please always build with all HW generations enabled to catch such errors.
> 

Yep, agree. I guess CONFIG_DRM_AMDGPU_SI might not be set as default, so
some guys didn't find it.

Thanks,
Rui
> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf

> Of Huang Rui

> Sent: Monday, September 19, 2016 4:12 AM

> To: amd-gfx@lists.freedesktop.org; Deucher, Alexander; Koenig, Christian

> Cc: Wang, Ken; Huang, Ray; Liu, Monk

> Subject: [PATCH] drm/amdgpu/si: remove unused interface which caused

> build issue

> 

> From: Huang Rui <Ray.Huang@amd.com>

> 

> Fix commit (ed22ee2 drm/amdgpu:changes of virtualization cases probe)

> regression, remove si_get_virtual_caps because the callback is removed

> at amdgpu_asic_funcs.

> 

> Signed-off-by: Huang Rui <Ray.Huang@amd.com>

> Cc: Monk Liu <Monk.Liu@amd.com>


Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


> ---

>  drivers/gpu/drm/amd/amdgpu/si.c | 7 -------

>  1 file changed, 7 deletions(-)

> 

> diff --git a/drivers/gpu/drm/amd/amdgpu/si.c

> b/drivers/gpu/drm/amd/amdgpu/si.c

> index fee76b8..a0b6b7e 100644

> --- a/drivers/gpu/drm/amd/amdgpu/si.c

> +++ b/drivers/gpu/drm/amd/amdgpu/si.c

> @@ -952,12 +952,6 @@ static void si_smc_wreg(struct amdgpu_device

> *adev, u32 reg, u32 v)

>  	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);

>  }

> 

> -static u32 si_get_virtual_caps(struct amdgpu_device *adev)

> -{

> -	/* SI does not support SR-IOV */

> -	return 0;

> -}

> -

>  static struct amdgpu_allowed_register_entry si_allowed_read_registers[] =

> {

>  	{GRBM_STATUS, false},

>  	{GB_ADDR_CONFIG, false},

> @@ -1133,7 +1127,6 @@ static const struct amdgpu_asic_funcs si_asic_funcs

> =

>  	.get_xclk = &si_get_xclk,

>  	.set_uvd_clocks = &si_set_uvd_clocks,

>  	.set_vce_clocks = NULL,

> -	.get_virtual_caps = &si_get_virtual_caps,

>  };

> 

>  static uint32_t si_get_rev_id(struct amdgpu_device *adev)

> --

> 2.7.4

> 

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx