drm/amdgpu: prevent spurious warning
Subsystems (4)
PATCH 1/1 drm/amdgpu: prevent spurious warning
The default auto setting for kcq should not generate a warning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -1
@@ -1372,7 +1372,9 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev)amdgpu_gmc_tmz_set (adev); -if (amdgpu_num_kcq >8 || amdgpu_num_kcq <0 ) { +if (amdgpu_num_kcq ==-1 ) { + amdgpu_num_kcq =8 ; + }else if (amdgpu_num_kcq >8 || amdgpu_num_kcq <0 ) { amdgpu_num_kcq =8 ;dev_warn (adev->dev,"set kernel compute queue number to 8 due to invalid parameter provided by user\n" ); }
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/1 drm/amdgpu/swsmu: fix ARC build errors
We want to use the dev_* functions here rather than the pr_* variants. Switch to using dev_warn() which mirrors what we do on other asics.
Fixes the following build errors on ARC:
../drivers/gpu/drm/amd/amdgpu/../powerplay/navi10_ppt.c: In function 'navi10_fill_i2c_req':../arch/arc/include/asm/bug.h:24:2: error: implicit declaration of function 'pr_warn'; did you mean 'drm_warn'? [-Werror=implicit-function-declaration]
../drivers/gpu/drm/amd/amdgpu/../powerplay/sienna_cichlid_ppt.c: In function 'sienna_cichlid_fill_i2c_req':../arch/arc/include/asm/bug.h:24:2: error: implicit declaration of function 'pr_warn'; did you mean 'drm_warn'? [-Werror=implicit-function-declaration]
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 14 ++++++++++++-- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +12 -2
@@ -2336,8 +2336,6 @@ static void navi10_fill_i2c_req(SwI2cRequest_t *req, bool write, {int i; -BUG_ON (numbytes >MAX_SW_I2C_COMMANDS ); - req->I2CcontrollerPort =0 ; req->I2CSpeed =2 ; req->SlaveAddress = address;
@@ -2375,6 +2373,12 @@ static int navi10_i2c_read_data(struct i2c_adapter *control,struct smu_table_context *smu_table = &adev->smu.smu_table;struct smu_table *table = &smu_table->driver_table; +if (numbytes >MAX_SW_I2C_COMMANDS ) { +dev_err (adev->dev,"numbytes requested %d is over max allowed %d\n" , + numbytes,MAX_SW_I2C_COMMANDS ); +return -EINVAL ; + } +memset (&req,0 ,sizeof (req));navi10_fill_i2c_req (&req, false, address, numbytes, data);
@@ -2411,6 +2415,12 @@ static int navi10_i2c_write_data(struct i2c_adapter *control,SwI2cRequest_t req;struct amdgpu_device *adev =to_amdgpu_device (control); +if (numbytes >MAX_SW_I2C_COMMANDS ) { +dev_err (adev->dev,"numbytes requested %d is over max allowed %d\n" , + numbytes,MAX_SW_I2C_COMMANDS ); +return -EINVAL ; + } +memset (&req,0 ,sizeof (req));navi10_fill_i2c_req (&req, true, address, numbytes, data);
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +12 -2
@@ -2422,8 +2422,6 @@ static void sienna_cichlid_fill_i2c_req(SwI2cRequest_t *req, bool write, {int i; -BUG_ON (numbytes >MAX_SW_I2C_COMMANDS ); - req->I2CcontrollerPort =0 ; req->I2CSpeed =2 ; req->SlaveAddress = address;
@@ -2461,6 +2459,12 @@ static int sienna_cichlid_i2c_read_data(struct i2c_adapter *control,struct smu_table_context *smu_table = &adev->smu.smu_table;struct smu_table *table = &smu_table->driver_table; +if (numbytes >MAX_SW_I2C_COMMANDS ) { +dev_err (adev->dev,"numbytes requested %d is over max allowed %d\n" , + numbytes,MAX_SW_I2C_COMMANDS ); +return -EINVAL ; + } +memset (&req,0 ,sizeof (req));sienna_cichlid_fill_i2c_req (&req, false, address, numbytes, data);
@@ -2497,6 +2501,12 @@ static int sienna_cichlid_i2c_write_data(struct i2c_adapter *control,SwI2cRequest_t req;struct amdgpu_device *adev =to_amdgpu_device (control); +if (numbytes >MAX_SW_I2C_COMMANDS ) { +dev_err (adev->dev,"numbytes requested %d is over max allowed %d\n" , + numbytes,MAX_SW_I2C_COMMANDS ); +return -EINVAL ; + } +memset (&req,0 ,sizeof (req));sienna_cichlid_fill_i2c_req (&req, true, address, numbytes, data);
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amdgpu/swsmu: fix ARC build errors
Quoted 17 lines · Alex Deucher
We want to use the dev_* functions here rather than the pr_* variants. Switch to using
dev_warn()which mirrors what we do on other asics.Fixes the following build errors on ARC:
../drivers/gpu/drm/amd/amdgpu/../powerplay/navi10_ppt.c: In function 'navi10_fill_i2c_req':../arch/arc/include/asm/bug.h:24:2: error: implicit declaration of function 'pr_warn'; did you mean 'drm_warn'? [-Werror=implicit-function-declaration]
../drivers/gpu/drm/amd/amdgpu/../powerplay/sienna_cichlid_ppt.c: In function 'sienna_cichlid_fill_i2c_req':../arch/arc/include/asm/bug.h:24:2: error: implicit declaration of function 'pr_warn'; did you mean 'drm_warn'? [-Werror=implicit-function-declaration]Reported-by kernel test robot <[email protected]>Cc Randy Dunlap <[email protected]>Cc Evan Quan <[email protected]>Cc Vineet Gupta <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 4 lines
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 14 ++++++++++++-- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-)
Works for me. Thanks.
Signature · 6 lines
~Randy _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
[AMD Public Use]
Kent
Quoted 38 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, October 6, 2020 9:27 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu: prevent spurious warningThe default auto setting for kcq should not generate a warning.
Fixes a300de40f66b ("drm/amdgpu: introduce a new parameter to configure how manyKCQ we want(v5)")
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -1372,7 +1372,9 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev)amdgpu_gmc_tmz_set (adev ); -if (amdgpu_num_kcq >8 || amdgpu_num_kcq <0 ) { +if (amdgpu_num_kcq ==-1 ) { + amdgpu_num_kcq =8 ; + }else if (amdgpu_num_kcq >8 || amdgpu_num_kcq <0 ) { amdgpu_num_kcq =8 ; dev_warn(adev->dev, "set kernel compute queue number to 8 due toinvalid parameter provided by user\n");
}
--
2.25.4
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.or
g%2Fmailman%2Flistinfo%2Famd- gfx&data=02%7C01%7Ckent.russell%40amd.com%7C4a54f0460acd4e92a43e08d869fb 8d14%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637375876466082586& sdata=rRpRoxlz6PIjDnhRPFPCom4Nn599DoVRG4Dl5iOlZRE%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx