Commit dcba603f authored by Alex Deucher's avatar Alex Deucher
Browse files

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]

Reported-by: default avatarkernel test robot <lkp@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Evan Quan <evan.quan@amd.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: linux-snps-arc@lists.infradead.org
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 33eade2c

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+12 −2
Original line number Diff line number Diff line
@@ -2265,8 +2265,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;
@@ -2304,6 +2302,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);
@@ -2340,6 +2344,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/powerplay/sienna_cichlid_ppt.c

+12 −2
Original line number Diff line number Diff line
@@ -2445,8 +2445,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;
@@ -2484,6 +2482,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);
@@ -2520,6 +2524,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE