* [PATCH 1/6] drm/amdgpu: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
@ 2020-03-26 21:09 ` Wolfram Sang
2020-03-26 21:10 ` [PATCH 2/6] drm/gma500: " Wolfram Sang
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:09 UTC (permalink / raw)
To: linux-i2c
Cc: David Airlie, linux-kernel, amd-gfx, Wolfram Sang, dri-devel,
Alex Deucher, Christian König
Move away from the deprecated API.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
index ba1bb95a3cf9..0e8018c9aa8e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
@@ -856,7 +856,7 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev)
const char *name = pp_lib_thermal_controller_names[controller->ucType];
info.addr = controller->ucI2cAddress >> 1;
strlcpy(info.type, name, sizeof(info.type));
- i2c_new_device(&adev->pm.i2c_bus->adapter, &info);
+ i2c_new_client_device(&adev->pm.i2c_bus->adapter, &info);
}
} else {
DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/6] drm/gma500: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
2020-03-26 21:09 ` [PATCH 1/6] drm/amdgpu: convert to use i2c_new_client_device() Wolfram Sang
@ 2020-03-26 21:10 ` Wolfram Sang
2020-03-26 21:10 ` [PATCH 3/6] drm/i2c/sil164: " Wolfram Sang
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:10 UTC (permalink / raw)
To: linux-i2c; +Cc: David Airlie, linux-kernel, dri-devel, Wolfram Sang
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
index 9e8224456ea2..71574063c63e 100644
--- a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
+++ b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
@@ -747,11 +747,11 @@ static int cmi_lcd_hack_create_device(void)
return -EINVAL;
}
- client = i2c_new_device(adapter, &info);
- if (!client) {
- pr_err("%s: i2c_new_device() failed\n", __func__);
+ client = i2c_new_client_device(adapter, &info);
+ if (IS_ERR(client)) {
+ pr_err("%s: creating I2C device failed\n", __func__);
i2c_put_adapter(adapter);
- return -EINVAL;
+ return PTR_ERR(client);
}
return 0;
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/6] drm/i2c/sil164: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
2020-03-26 21:09 ` [PATCH 1/6] drm/amdgpu: convert to use i2c_new_client_device() Wolfram Sang
2020-03-26 21:10 ` [PATCH 2/6] drm/gma500: " Wolfram Sang
@ 2020-03-26 21:10 ` Wolfram Sang
2020-03-26 21:10 ` [PATCH 4/6] drm/i2c/tda998x: " Wolfram Sang
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:10 UTC (permalink / raw)
To: linux-i2c; +Cc: David Airlie, Wolfram Sang, dri-devel, linux-kernel
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/i2c/sil164_drv.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
index a839f78a4c8a..741886b54419 100644
--- a/drivers/gpu/drm/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -393,7 +393,7 @@ sil164_detect_slave(struct i2c_client *client)
return NULL;
}
- return i2c_new_device(adap, &info);
+ return i2c_new_client_device(adap, &info);
}
static int
@@ -402,6 +402,7 @@ sil164_encoder_init(struct i2c_client *client,
struct drm_encoder_slave *encoder)
{
struct sil164_priv *priv;
+ struct i2c_client *slave_client;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -410,7 +411,9 @@ sil164_encoder_init(struct i2c_client *client,
encoder->slave_priv = priv;
encoder->slave_funcs = &sil164_encoder_funcs;
- priv->duallink_slave = sil164_detect_slave(client);
+ slave_client = sil164_detect_slave(client);
+ if (!IS_ERR(slave_client))
+ priv->duallink_slave = slave_client;
return 0;
}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/6] drm/i2c/tda998x: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
` (2 preceding siblings ...)
2020-03-26 21:10 ` [PATCH 3/6] drm/i2c/sil164: " Wolfram Sang
@ 2020-03-26 21:10 ` Wolfram Sang
2020-03-26 21:10 ` [PATCH 5/6] drm/nouveau/therm: " Wolfram Sang
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:10 UTC (permalink / raw)
To: linux-i2c
Cc: David Airlie, Russell King, dri-devel, linux-kernel, Wolfram Sang
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/i2c/tda998x_drv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index c3332209f27a..d9a548d0273c 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1949,9 +1949,9 @@ static int tda998x_create(struct device *dev)
cec_info.platform_data = &priv->cec_glue;
cec_info.irq = client->irq;
- priv->cec = i2c_new_device(client->adapter, &cec_info);
- if (!priv->cec) {
- ret = -ENODEV;
+ priv->cec = i2c_new_client_device(client->adapter, &cec_info);
+ if (IS_ERR(priv->cec)) {
+ ret = PTR_ERR(priv->cec);
goto fail;
}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/6] drm/nouveau/therm: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
` (3 preceding siblings ...)
2020-03-26 21:10 ` [PATCH 4/6] drm/i2c/tda998x: " Wolfram Sang
@ 2020-03-26 21:10 ` Wolfram Sang
2020-03-26 21:10 ` [PATCH 6/6] drm/radeon: " Wolfram Sang
2020-03-28 21:49 ` [PATCH 0/6] gpu: convert to use new I2C API Sam Ravnborg
6 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:10 UTC (permalink / raw)
To: linux-i2c
Cc: David Airlie, nouveau, linux-kernel, dri-devel, Wolfram Sang,
Ben Skeggs
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c
index 03b355dabab3..abf3eda683f0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c
@@ -36,8 +36,8 @@ probe_monitoring_device(struct nvkm_i2c_bus *bus,
request_module("%s%s", I2C_MODULE_PREFIX, info->type);
- client = i2c_new_device(&bus->i2c, info);
- if (!client)
+ client = i2c_new_client_device(&bus->i2c, info);
+ if (IS_ERR(client))
return false;
if (!client->dev.driver ||
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
` (4 preceding siblings ...)
2020-03-26 21:10 ` [PATCH 5/6] drm/nouveau/therm: " Wolfram Sang
@ 2020-03-26 21:10 ` Wolfram Sang
2020-03-27 14:25 ` Alex Deucher
2020-03-28 21:49 ` [PATCH 0/6] gpu: convert to use new I2C API Sam Ravnborg
6 siblings, 1 reply; 13+ messages in thread
From: Wolfram Sang @ 2020-03-26 21:10 UTC (permalink / raw)
To: linux-i2c
Cc: David Airlie, linux-kernel, amd-gfx, Wolfram Sang, dri-devel,
Alex Deucher, Christian König
Move away from the deprecated API.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++--
drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 848ef68d9086..5d2591725189 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -2111,7 +2111,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
ucOverdriveThermalController];
info.addr = power_info->info.ucOverdriveControllerAddress >> 1;
strlcpy(info.type, name, sizeof(info.type));
- i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
+ i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
}
}
num_modes = power_info->info.ucNumOfPowerModeEntries;
@@ -2351,7 +2351,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r
const char *name = pp_lib_thermal_controller_names[controller->ucType];
info.addr = controller->ucI2cAddress >> 1;
strlcpy(info.type, name, sizeof(info.type));
- i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
+ i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
}
} else {
DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index c3e49c973812..d3c04df7e75d 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -2704,7 +2704,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
const char *name = thermal_controller_names[thermal_controller];
info.addr = i2c_addr >> 1;
strlcpy(info.type, name, sizeof(info.type));
- i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
+ i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
}
}
} else {
@@ -2721,7 +2721,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
const char *name = "f75375";
info.addr = 0x28;
strlcpy(info.type, name, sizeof(info.type));
- i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
+ i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
DRM_INFO("Possible %s thermal controller at 0x%02x\n",
name, info.addr);
}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-26 21:10 ` [PATCH 6/6] drm/radeon: " Wolfram Sang
@ 2020-03-27 14:25 ` Alex Deucher
2020-03-27 15:25 ` Sam Ravnborg
0 siblings, 1 reply; 13+ messages in thread
From: Alex Deucher @ 2020-03-27 14:25 UTC (permalink / raw)
To: Wolfram Sang
Cc: amd-gfx list, David Airlie, LKML, Maling list - DRI developers,
Linux I2C, Alex Deucher, Christian König
On Thu, Mar 26, 2020 at 5:35 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
>
> Move away from the deprecated API.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
patches 1,6, are:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++--
> drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
> index 848ef68d9086..5d2591725189 100644
> --- a/drivers/gpu/drm/radeon/radeon_atombios.c
> +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
> @@ -2111,7 +2111,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
> ucOverdriveThermalController];
> info.addr = power_info->info.ucOverdriveControllerAddress >> 1;
> strlcpy(info.type, name, sizeof(info.type));
> - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> }
> }
> num_modes = power_info->info.ucNumOfPowerModeEntries;
> @@ -2351,7 +2351,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r
> const char *name = pp_lib_thermal_controller_names[controller->ucType];
> info.addr = controller->ucI2cAddress >> 1;
> strlcpy(info.type, name, sizeof(info.type));
> - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> }
> } else {
> DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",
> diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
> index c3e49c973812..d3c04df7e75d 100644
> --- a/drivers/gpu/drm/radeon/radeon_combios.c
> +++ b/drivers/gpu/drm/radeon/radeon_combios.c
> @@ -2704,7 +2704,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> const char *name = thermal_controller_names[thermal_controller];
> info.addr = i2c_addr >> 1;
> strlcpy(info.type, name, sizeof(info.type));
> - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> }
> }
> } else {
> @@ -2721,7 +2721,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> const char *name = "f75375";
> info.addr = 0x28;
> strlcpy(info.type, name, sizeof(info.type));
> - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> DRM_INFO("Possible %s thermal controller at 0x%02x\n",
> name, info.addr);
> }
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-27 14:25 ` Alex Deucher
@ 2020-03-27 15:25 ` Sam Ravnborg
2020-03-27 15:27 ` Alex Deucher
0 siblings, 1 reply; 13+ messages in thread
From: Sam Ravnborg @ 2020-03-27 15:25 UTC (permalink / raw)
To: Alex Deucher
Cc: David Airlie, LKML, Maling list - DRI developers, Wolfram Sang,
amd-gfx list, Alex Deucher, Christian König, Linux I2C
On Fri, Mar 27, 2020 at 10:25:16AM -0400, Alex Deucher wrote:
> On Thu, Mar 26, 2020 at 5:35 PM Wolfram Sang
> <wsa+renesas@sang-engineering.com> wrote:
> >
> > Move away from the deprecated API.
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> patches 1,6, are:
> Acked-by: Alex Deucher <alexander.deucher@amd.com>
Should we commit all to drm-misc-next?
Sam
>
> > ---
> > drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++--
> > drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
> > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
> > index 848ef68d9086..5d2591725189 100644
> > --- a/drivers/gpu/drm/radeon/radeon_atombios.c
> > +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
> > @@ -2111,7 +2111,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
> > ucOverdriveThermalController];
> > info.addr = power_info->info.ucOverdriveControllerAddress >> 1;
> > strlcpy(info.type, name, sizeof(info.type));
> > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > }
> > }
> > num_modes = power_info->info.ucNumOfPowerModeEntries;
> > @@ -2351,7 +2351,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r
> > const char *name = pp_lib_thermal_controller_names[controller->ucType];
> > info.addr = controller->ucI2cAddress >> 1;
> > strlcpy(info.type, name, sizeof(info.type));
> > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > }
> > } else {
> > DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",
> > diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
> > index c3e49c973812..d3c04df7e75d 100644
> > --- a/drivers/gpu/drm/radeon/radeon_combios.c
> > +++ b/drivers/gpu/drm/radeon/radeon_combios.c
> > @@ -2704,7 +2704,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> > const char *name = thermal_controller_names[thermal_controller];
> > info.addr = i2c_addr >> 1;
> > strlcpy(info.type, name, sizeof(info.type));
> > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > }
> > }
> > } else {
> > @@ -2721,7 +2721,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> > const char *name = "f75375";
> > info.addr = 0x28;
> > strlcpy(info.type, name, sizeof(info.type));
> > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > DRM_INFO("Possible %s thermal controller at 0x%02x\n",
> > name, info.addr);
> > }
> > --
> > 2.20.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-27 15:25 ` Sam Ravnborg
@ 2020-03-27 15:27 ` Alex Deucher
2020-03-27 15:45 ` Wolfram Sang
0 siblings, 1 reply; 13+ messages in thread
From: Alex Deucher @ 2020-03-27 15:27 UTC (permalink / raw)
To: Sam Ravnborg
Cc: David Airlie, LKML, Maling list - DRI developers, Wolfram Sang,
amd-gfx list, Alex Deucher, Christian König, Linux I2C
On Fri, Mar 27, 2020 at 11:25 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Fri, Mar 27, 2020 at 10:25:16AM -0400, Alex Deucher wrote:
> > On Thu, Mar 26, 2020 at 5:35 PM Wolfram Sang
> > <wsa+renesas@sang-engineering.com> wrote:
> > >
> > > Move away from the deprecated API.
> > >
> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >
> > patches 1,6, are:
> > Acked-by: Alex Deucher <alexander.deucher@amd.com>
> Should we commit all to drm-misc-next?
I'm fine to see it go through whatever tree makes sense.
Alex
>
> Sam
>
>
> >
> > > ---
> > > drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++--
> > > drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
> > > 2 files changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
> > > index 848ef68d9086..5d2591725189 100644
> > > --- a/drivers/gpu/drm/radeon/radeon_atombios.c
> > > +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
> > > @@ -2111,7 +2111,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
> > > ucOverdriveThermalController];
> > > info.addr = power_info->info.ucOverdriveControllerAddress >> 1;
> > > strlcpy(info.type, name, sizeof(info.type));
> > > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > > }
> > > }
> > > num_modes = power_info->info.ucNumOfPowerModeEntries;
> > > @@ -2351,7 +2351,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r
> > > const char *name = pp_lib_thermal_controller_names[controller->ucType];
> > > info.addr = controller->ucI2cAddress >> 1;
> > > strlcpy(info.type, name, sizeof(info.type));
> > > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > > }
> > > } else {
> > > DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",
> > > diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
> > > index c3e49c973812..d3c04df7e75d 100644
> > > --- a/drivers/gpu/drm/radeon/radeon_combios.c
> > > +++ b/drivers/gpu/drm/radeon/radeon_combios.c
> > > @@ -2704,7 +2704,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> > > const char *name = thermal_controller_names[thermal_controller];
> > > info.addr = i2c_addr >> 1;
> > > strlcpy(info.type, name, sizeof(info.type));
> > > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > > }
> > > }
> > > } else {
> > > @@ -2721,7 +2721,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> > > const char *name = "f75375";
> > > info.addr = 0x28;
> > > strlcpy(info.type, name, sizeof(info.type));
> > > - i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
> > > + i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
> > > DRM_INFO("Possible %s thermal controller at 0x%02x\n",
> > > name, info.addr);
> > > }
> > > --
> > > 2.20.1
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-27 15:27 ` Alex Deucher
@ 2020-03-27 15:45 ` Wolfram Sang
2020-03-27 17:03 ` Sam Ravnborg
0 siblings, 1 reply; 13+ messages in thread
From: Wolfram Sang @ 2020-03-27 15:45 UTC (permalink / raw)
To: Alex Deucher
Cc: David Airlie, LKML, Maling list - DRI developers, Wolfram Sang,
amd-gfx list, Alex Deucher, Sam Ravnborg, Christian König,
Linux I2C
[-- Attachment #1.1: Type: text/plain, Size: 435 bytes --]
> > > > Move away from the deprecated API.
> > > >
> > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > >
> > > patches 1,6, are:
> > > Acked-by: Alex Deucher <alexander.deucher@amd.com>
> > Should we commit all to drm-misc-next?
>
> I'm fine to see it go through whatever tree makes sense.
I'd suggest drm-misc-next to minimize merge conflicts. But I can take it
via I2C tree, too, if desired.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] drm/radeon: convert to use i2c_new_client_device()
2020-03-27 15:45 ` Wolfram Sang
@ 2020-03-27 17:03 ` Sam Ravnborg
0 siblings, 0 replies; 13+ messages in thread
From: Sam Ravnborg @ 2020-03-27 17:03 UTC (permalink / raw)
To: Wolfram Sang
Cc: David Airlie, LKML, Maling list - DRI developers, Wolfram Sang,
amd-gfx list, Alex Deucher, Christian König, Linux I2C
On Fri, Mar 27, 2020 at 04:45:09PM +0100, Wolfram Sang wrote:
>
> > > > > Move away from the deprecated API.
> > > > >
> > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > >
> > > > patches 1,6, are:
> > > > Acked-by: Alex Deucher <alexander.deucher@amd.com>
> > > Should we commit all to drm-misc-next?
> >
> > I'm fine to see it go through whatever tree makes sense.
>
> I'd suggest drm-misc-next to minimize merge conflicts. But I can take it
> via I2C tree, too, if desired.
If no-one else speaks up until tomorrow I will land them in
drm-misc-next.
Just wanted to make sure it was OK.
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/6] gpu: convert to use new I2C API
2020-03-26 21:09 [PATCH 0/6] gpu: convert to use new I2C API Wolfram Sang
` (5 preceding siblings ...)
2020-03-26 21:10 ` [PATCH 6/6] drm/radeon: " Wolfram Sang
@ 2020-03-28 21:49 ` Sam Ravnborg
6 siblings, 0 replies; 13+ messages in thread
From: Sam Ravnborg @ 2020-03-28 21:49 UTC (permalink / raw)
To: Wolfram Sang; +Cc: nouveau, amd-gfx, linux-i2c, dri-devel, linux-kernel
On Thu, Mar 26, 2020 at 10:09:58PM +0100, Wolfram Sang wrote:
> We are deprecating calls which return NULL in favor of new variants which
> return an ERR_PTR. Only build tested.
>
>
> Wolfram Sang (6):
> drm/amdgpu: convert to use i2c_new_client_device()
> drm/gma500: convert to use i2c_new_client_device()
> drm/i2c/sil164: convert to use i2c_new_client_device()
> drm/i2c/tda998x: convert to use i2c_new_client_device()
> drm/nouveau/therm: convert to use i2c_new_client_device()
> drm/radeon: convert to use i2c_new_client_device()
With the ack from Alex I went ahead and applied the patches to
drm-misc-next.
Sam
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +-
> drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 8 ++++----
> drivers/gpu/drm/i2c/sil164_drv.c | 7 +++++--
> drivers/gpu/drm/i2c/tda998x_drv.c | 6 +++---
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c | 4 ++--
> drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++--
> drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
> 7 files changed, 19 insertions(+), 16 deletions(-)
>
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread