Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 517069ff authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Three misc amd fixes.

* 'drm-fixes-4.13' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/powerplay: fix AVFS voltage offset for Vega10
  drm/amdgpu/gfx9: simplify and fix GRBM index selection
  drm/amdgpu: Fix blocking in RCU critical section(v2)
parents cfd10811 41ebafc0

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

+7 −3
Original line number Diff line number Diff line
@@ -198,12 +198,16 @@ amdgpu_bo_list_get(struct amdgpu_fpriv *fpriv, int id) 
	result = idr_find(&fpriv->bo_list_handles, id);



	if (result) {

		if (kref_get_unless_zero(&result->refcount))

		if (kref_get_unless_zero(&result->refcount)) {

			rcu_read_unlock();

			mutex_lock(&result->lock);

		else

		} else {

			rcu_read_unlock();

			result = NULL;

		}

	} else {

		rcu_read_unlock();

	}



	return result;

}

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

+13 −11
Original line number Diff line number Diff line
@@ -1475,21 +1475,23 @@ static void gfx_v9_0_tiling_mode_table_init(struct amdgpu_device *adev) 


static void gfx_v9_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, u32 sh_num, u32 instance)

{

	u32 data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES, 1);

	u32 data;



	if ((se_num == 0xffffffff) && (sh_num == 0xffffffff)) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_BROADCAST_WRITES, 1);

	} else if (se_num == 0xffffffff) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_INDEX, sh_num);

	if (instance == 0xffffffff)

		data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_INDEX, instance);



	if (se_num == 0xffffffff)

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_BROADCAST_WRITES, 1);

	} else if (sh_num == 0xffffffff) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_INDEX, se_num);

	} else {



	if (sh_num == 0xffffffff)

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_INDEX, sh_num);

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_INDEX, se_num);

	}



	WREG32_SOC15(GC, 0, mmGRBM_GFX_INDEX, data);

}

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+3 −9
Original line number Diff line number Diff line
@@ -2128,15 +2128,9 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr) 
			pp_table->AvfsGbCksOff.m2_shift = 12;

			pp_table->AvfsGbCksOff.b_shift = 0;



			for (i = 0; i < dep_table->count; i++) {

				if (dep_table->entries[i].sclk_offset == 0)

					pp_table->StaticVoltageOffsetVid[i] = 248;

				else

			for (i = 0; i < dep_table->count; i++)

				pp_table->StaticVoltageOffsetVid[i] =

						(uint8_t)(dep_table->entries[i].sclk_offset *

								VOLTAGE_VID_OFFSET_SCALE2 /

								VOLTAGE_VID_OFFSET_SCALE1);

			}

						convert_to_vid((uint8_t)(dep_table->entries[i].sclk_offset));



			if ((PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=

					data->disp_clk_quad_eqn_a) &&