Commit fd330b1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-10-09' of git://anongit.freedesktop.org/drm/drm 

Pull amdgpu drm fixes from Dave Airlie:
 "Fixes trickling in this week.

  Alex had a final fix for the newest GPU they introduced in rc1, along
  with one build regression and one crasher fix.

  Cross my fingers that's it for 5.9:

   - Fix a crash on renoir if you override the IP discovery parameter

   - Fix the build on ARC platforms

   - Display fix for Sienna Cichlid"

* tag 'drm-fixes-2020-10-09' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: Change ABM config init interface
  drm/amdgpu/swsmu: fix ARC build errors
  drm/amdgpu: fix NULL pointer dereference for Renoir
parents 583090b1 dded93ff

drivers/gpu/drm/amd/amdgpu/soc15.c

+5 −5
Original line number Diff line number Diff line
@@ -694,12 +694,12 @@ static void soc15_reg_base_init(struct amdgpu_device *adev) 
		 * it doesn't support SRIOV. */

		if (amdgpu_discovery) {

			r = amdgpu_discovery_reg_base_init(adev);

			if (r) {

			if (r == 0)

				break;

			DRM_WARN("failed to init reg base from ip discovery table, "

				 "fallback to legacy init method\n");

				vega10_reg_base_init(adev);

			}

		}

		vega10_reg_base_init(adev);

		break;

	case CHIP_VEGA20:

		vega20_reg_base_init(adev);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ static int dm_late_init(void *handle) 
	if (dmcu)

		ret = dmcu_load_iram(dmcu, params);

	else if (adev->dm.dc->ctx->dmub_srv)

		ret = dmub_init_abm_config(adev->dm.dc->res_pool->abm, params);

		ret = dmub_init_abm_config(adev->dm.dc->res_pool, params);



	if (!ret)

		return -EINVAL;

drivers/gpu/drm/amd/display/modules/power/power_helpers.c

+15 −4
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ void fill_iram_v_2_3(struct iram_table_v_2_2 *ram_table, struct dmcu_iram_parame 
			params, ram_table, big_endian);

}



bool dmub_init_abm_config(struct abm *abm,

bool dmub_init_abm_config(struct resource_pool *res_pool,

	struct dmcu_iram_parameters params)

{

	struct iram_table_v_2_2 ram_table;
@@ -665,8 +665,13 @@ bool dmub_init_abm_config(struct abm *abm, 
	bool result = false;

	uint32_t i, j = 0;



	if (abm == NULL)

#if defined(CONFIG_DRM_AMD_DC_DCN3_0)

	if (res_pool->abm == NULL && res_pool->multiple_abms[0] == NULL)

		return false;

#else

	if (res_pool->abm == NULL)

		return false;

#endif



	memset(&ram_table, 0, sizeof(ram_table));

	memset(&config, 0, sizeof(config));
@@ -707,8 +712,14 @@ bool dmub_init_abm_config(struct abm *abm, 


	config.min_abm_backlight = ram_table.min_abm_backlight;



	result = abm->funcs->init_abm_config(

		abm, (char *)(&config), sizeof(struct abm_config_table));

#if defined(CONFIG_DRM_AMD_DC_DCN3_0)

	if (res_pool->multiple_abms[0]) {

		result = res_pool->multiple_abms[0]->funcs->init_abm_config(

			res_pool->multiple_abms[0], (char *)(&config), sizeof(struct abm_config_table));

	} else

#endif

		result = res_pool->abm->funcs->init_abm_config(

			res_pool->abm, (char *)(&config), sizeof(struct abm_config_table));



	return result;

}

drivers/gpu/drm/amd/display/modules/power/power_helpers.h

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include "dc/inc/hw/dmcu.h"

#include "dc/inc/hw/abm.h"



struct resource_pool;





enum abm_defines {

	abm_defines_max_level = 4,
@@ -45,7 +47,7 @@ struct dmcu_iram_parameters { 


bool dmcu_load_iram(struct dmcu *dmcu,

		struct dmcu_iram_parameters params);

bool dmub_init_abm_config(struct abm *abm,

bool dmub_init_abm_config(struct resource_pool *res_pool,

		struct dmcu_iram_parameters params);



#endif /* MODULES_POWER_POWER_HELPERS_H_ */

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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE