[PATCH] drm/amdgpu: correct clock info for SRIOV

[PATCH] drm/amdgpu: correct clock info for SRIOV

[Xiangliang Yu]

Currently, get clock info from default clk of pm if dpm is disable.
Buf SRIOV doesn't support dpm and pm, can't get anything from pm.
Only get clock info only from default clk of amdgpu for SRIOV.

And driver get pm default clk also from amdgpu default clk and never
be changed by others. So use amdgpu default clk value for SRIOV
and non-dpm cases.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 4947f04..1935f07 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -530,8 +530,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 			dev_info.max_engine_clock = amdgpu_dpm_get_sclk(adev, false) * 10;
 			dev_info.max_memory_clock = amdgpu_dpm_get_mclk(adev, false) * 10;
 		} else {
-			dev_info.max_engine_clock = adev->pm.default_sclk * 10;
-			dev_info.max_memory_clock = adev->pm.default_mclk * 10;
+			dev_info.max_engine_clock = adev->clock.default_sclk * 10;
+			dev_info.max_memory_clock = adev->clock.default_mclk * 10;
 		}
 		dev_info.enabled_rb_pipes_mask = adev->gfx.config.backend_enable_mask;
 		dev_info.num_rb_pipes = adev->gfx.config.max_backends_per_se *
-- 
2.7.4

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

RE: [PATCH] drm/amdgpu: correct clock info for SRIOV

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Xiangliang Yu
> Sent: Saturday, June 03, 2017 5:45 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Yu, Xiangliang
> Subject: [PATCH] drm/amdgpu: correct clock info for SRIOV
> 
> Currently, get clock info from default clk of pm if dpm is disable.
> Buf SRIOV doesn't support dpm and pm, can't get anything from pm.
> Only get clock info only from default clk of amdgpu for SRIOV.
> 
> And driver get pm default clk also from amdgpu default clk and never
> be changed by others. So use amdgpu default clk value for SRIOV
> and non-dpm cases.

This won't work for vega10 or Raven since we don't parse the default clock info on them anymore due to atom firmware changes.

Alex

> 
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 4947f04..1935f07 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -530,8 +530,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev,
> void *data, struct drm_file
>  			dev_info.max_engine_clock =
> amdgpu_dpm_get_sclk(adev, false) * 10;
>  			dev_info.max_memory_clock =
> amdgpu_dpm_get_mclk(adev, false) * 10;
>  		} else {
> -			dev_info.max_engine_clock = adev-
> >pm.default_sclk * 10;
> -			dev_info.max_memory_clock = adev-
> >pm.default_mclk * 10;
> +			dev_info.max_engine_clock = adev-
> >clock.default_sclk * 10;
> +			dev_info.max_memory_clock = adev-
> >clock.default_mclk * 10;
>  		}
>  		dev_info.enabled_rb_pipes_mask = adev-
> >gfx.config.backend_enable_mask;
>  		dev_info.num_rb_pipes = adev-
> >gfx.config.max_backends_per_se *
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu: correct clock info for SRIOV

[Yu, Xiangliang]

> > Currently, get clock info from default clk of pm if dpm is disable.
> > Buf SRIOV doesn't support dpm and pm, can't get anything from pm.
> > Only get clock info only from default clk of amdgpu for SRIOV.
> >
> > And driver get pm default clk also from amdgpu default clk and never
> > be changed by others. So use amdgpu default clk value for SRIOV and
> > non-dpm cases.
> 
> This won't work for vega10 or Raven since we don't parse the default clock
> info on them anymore due to atom firmware changes.

I don't get the info.
Even so, we need to support this for VI family.

> 
> Alex
> 
> >
> > Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > index 4947f04..1935f07 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > @@ -530,8 +530,8 @@ static int amdgpu_info_ioctl(struct drm_device
> > *dev, void *data, struct drm_file
> >  			dev_info.max_engine_clock =
> > amdgpu_dpm_get_sclk(adev, false) * 10;
> >  			dev_info.max_memory_clock =
> > amdgpu_dpm_get_mclk(adev, false) * 10;
> >  		} else {
> > -			dev_info.max_engine_clock = adev-
> > >pm.default_sclk * 10;
> > -			dev_info.max_memory_clock = adev-
> > >pm.default_mclk * 10;
> > +			dev_info.max_engine_clock = adev-
> > >clock.default_sclk * 10;
> > +			dev_info.max_memory_clock = adev-
> > >clock.default_mclk * 10;
> >  		}
> >  		dev_info.enabled_rb_pipes_mask = adev-
> > >gfx.config.backend_enable_mask;
> >  		dev_info.num_rb_pipes = adev-
> > >gfx.config.max_backends_per_se *
> > --
> > 2.7.4
> >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu: correct clock info for SRIOV

[Deucher, Alexander]

> -----Original Message-----
> From: Yu, Xiangliang
> Sent: Monday, June 05, 2017 10:33 PM
> To: Deucher, Alexander; amd-gfx@lists.freedesktop.org
> Subject: RE: [PATCH] drm/amdgpu: correct clock info for SRIOV
> 
> > > Currently, get clock info from default clk of pm if dpm is disable.
> > > Buf SRIOV doesn't support dpm and pm, can't get anything from pm.
> > > Only get clock info only from default clk of amdgpu for SRIOV.
> > >
> > > And driver get pm default clk also from amdgpu default clk and never
> > > be changed by others. So use amdgpu default clk value for SRIOV and
> > > non-dpm cases.
> >
> > This won't work for vega10 or Raven since we don't parse the default clock
> > info on them anymore due to atom firmware changes.
> 
> I don't get the info.
> Even so, we need to support this for VI family.

The default clocks are the boot clocks which don't reflect the actual clocks that chip is running it.  Assuming that is ok, the patch is:
Acked-by: Alex Deucher <alexander.deucher@amd.com>

> 
> >
> > Alex
> >
> > >
> > > Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> > > ---
> > >  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > index 4947f04..1935f07 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > @@ -530,8 +530,8 @@ static int amdgpu_info_ioctl(struct drm_device
> > > *dev, void *data, struct drm_file
> > >  			dev_info.max_engine_clock =
> > > amdgpu_dpm_get_sclk(adev, false) * 10;
> > >  			dev_info.max_memory_clock =
> > > amdgpu_dpm_get_mclk(adev, false) * 10;
> > >  		} else {
> > > -			dev_info.max_engine_clock = adev-
> > > >pm.default_sclk * 10;
> > > -			dev_info.max_memory_clock = adev-
> > > >pm.default_mclk * 10;
> > > +			dev_info.max_engine_clock = adev-
> > > >clock.default_sclk * 10;
> > > +			dev_info.max_memory_clock = adev-
> > > >clock.default_mclk * 10;
> > >  		}
> > >  		dev_info.enabled_rb_pipes_mask = adev-
> > > >gfx.config.backend_enable_mask;
> > >  		dev_info.num_rb_pipes = adev-
> > > >gfx.config.max_backends_per_se *
> > > --
> > > 2.7.4
> > >
> > > _______________________________________________
> > > amd-gfx mailing list
> > > amd-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx