diff mbox series

drm/amd/pm: remove deprecated I2C_CLASS_SPD support from newly added SMU_14_0_2

Message ID ed236ed6-0e6d-4243-8316-28485c9797c0@gmail.com
State New
Headers show
Series drm/amd/pm: remove deprecated I2C_CLASS_SPD support from newly added SMU_14_0_2 | expand

Commit Message

Heiner Kallweit May 9, 2024, 11:37 a.m. UTC
Support for I2C_CLASS_SPD  is currently being removed from the kernel.
Only remaining step is to remove the definition of I2C_CLASS_SPD.
Setting I2C_CLASS_SPD  in a driver is a no-op meanwhile, so remove it
here.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Alex Deucher May 9, 2024, 5:15 p.m. UTC | #1
On Thu, May 9, 2024 at 8:02 AM Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> Support for I2C_CLASS_SPD  is currently being removed from the kernel.
> Only remaining step is to remove the definition of I2C_CLASS_SPD.
> Setting I2C_CLASS_SPD  in a driver is a no-op meanwhile, so remove it
> here.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

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

Thanks!

> ---
>  drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
> index 0d5ad531c..fb6f3bbe2 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
> @@ -1616,7 +1616,6 @@ static int smu_v14_0_2_i2c_control_init(struct smu_context *smu)
>                 smu_i2c->port = i;
>                 mutex_init(&smu_i2c->mutex);
>                 control->owner = THIS_MODULE;
> -               control->class = I2C_CLASS_SPD;
>                 control->dev.parent = &adev->pdev->dev;
>                 control->algo = &smu_v14_0_2_i2c_algo;
>                 snprintf(control->name, sizeof(control->name), "AMDGPU SMU %d", i);
> --
> 2.45.0
>
Wolfram Sang May 29, 2024, 6:47 a.m. UTC | #2
Hi Alex,

On Thu, May 09, 2024 at 01:15:32PM -0400, Alex Deucher wrote:
> On Thu, May 9, 2024 at 8:02 AM Heiner Kallweit <hkallweit1@gmail.com> wrote:
> >
> > Support for I2C_CLASS_SPD  is currently being removed from the kernel.
> > Only remaining step is to remove the definition of I2C_CLASS_SPD.
> > Setting I2C_CLASS_SPD  in a driver is a no-op meanwhile, so remove it
> > here.
> >
> > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> 
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> and applied.

TLDR: can you ack this so I can apply it for -rc2?

Reason: I2C_CLASS_SPD was scheduled to be removed for 5.10. For some
reason, the newly introduced usage of I2C_CLASS_SPD in this driver went
unnoticed in -next. I would really like to remove I2C_CLASS_SPD now
before other users appear in the next cycle. In my experience, it is
possible to send Linus such patches for early rcX. Like it fixes a "bug"
when trying to handle a moving target.

So, would that be possible that I push this upstream so I can ultimately
remove I2C_CLASS_SPD without further dependencies? If you prefer to push
it through your tree, can you send it to Linus soon?

Thanks and happy hacking,

   Wolfram
Alex Deucher May 29, 2024, 9:09 p.m. UTC | #3
On Wed, May 29, 2024 at 2:47 AM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
>
> Hi Alex,
>
> On Thu, May 09, 2024 at 01:15:32PM -0400, Alex Deucher wrote:
> > On Thu, May 9, 2024 at 8:02 AM Heiner Kallweit <hkallweit1@gmail.com> wrote:
> > >
> > > Support for I2C_CLASS_SPD  is currently being removed from the kernel.
> > > Only remaining step is to remove the definition of I2C_CLASS_SPD.
> > > Setting I2C_CLASS_SPD  in a driver is a no-op meanwhile, so remove it
> > > here.
> > >
> > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> >
> > Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> > and applied.
>
> TLDR: can you ack this so I can apply it for -rc2?
>
> Reason: I2C_CLASS_SPD was scheduled to be removed for 5.10. For some
> reason, the newly introduced usage of I2C_CLASS_SPD in this driver went
> unnoticed in -next. I would really like to remove I2C_CLASS_SPD now
> before other users appear in the next cycle. In my experience, it is
> possible to send Linus such patches for early rcX. Like it fixes a "bug"
> when trying to handle a moving target.
>
> So, would that be possible that I push this upstream so I can ultimately
> remove I2C_CLASS_SPD without further dependencies? If you prefer to push
> it through your tree, can you send it to Linus soon?

Yes, I'll include the patch in my PR for this week.

Thanks,

Alex
Wolfram Sang May 29, 2024, 10:06 p.m. UTC | #4
> > remove I2C_CLASS_SPD without further dependencies? If you prefer to push
> > it through your tree, can you send it to Linus soon?
> 
> Yes, I'll include the patch in my PR for this week.

Awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index 0d5ad531c..fb6f3bbe2 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -1616,7 +1616,6 @@  static int smu_v14_0_2_i2c_control_init(struct smu_context *smu)
 		smu_i2c->port = i;
 		mutex_init(&smu_i2c->mutex);
 		control->owner = THIS_MODULE;
-		control->class = I2C_CLASS_SPD;
 		control->dev.parent = &adev->pdev->dev;
 		control->algo = &smu_v14_0_2_i2c_algo;
 		snprintf(control->name, sizeof(control->name), "AMDGPU SMU %d", i);