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

Commit 221bda4b authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- Fix a dark screen issue in DC
- Fix clk/voltage dependency tracking for wattman
- Update SMU interface for vega12

* 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/powerplay: header file interface to SMU update
  drm/amd/pp: Fix bug voltage can't be OD separately on VI
  drm/amd/display: Don't program bypass on linear regamma LUT
parents 2e1d6eab cc9e992d

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

+0 −7
Original line number Diff line number Diff line
@@ -138,13 +138,6 @@ int amdgpu_dm_set_regamma_lut(struct dm_crtc_state *crtc) 
	lut = (struct drm_color_lut *)blob->data;

	lut_size = blob->length / sizeof(struct drm_color_lut);



	if (__is_lut_linear(lut, lut_size)) {

		/* Set to bypass if lut is set to linear */

		stream->out_transfer_func->type = TF_TYPE_BYPASS;

		stream->out_transfer_func->tf = TRANSFER_FUNCTION_LINEAR;

		return 0;

	}



	gamma = dc_create_gamma();

	if (!gamma)

		return -ENOMEM;

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

+10 −6
Original line number Diff line number Diff line
@@ -4743,23 +4743,27 @@ static void smu7_check_dpm_table_updated(struct pp_hwmgr *hwmgr) 


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

		if (dep_table->entries[i].vddc != odn_dep_table->entries[i].vddc) {

			data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_VDDC;

			break;

			data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_VDDC | DPMTABLE_OD_UPDATE_MCLK;

			return;

		}

	}

	if (i == dep_table->count)

	if (i == dep_table->count && data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_VDDC) {

		data->need_update_smu7_dpm_table &= ~DPMTABLE_OD_UPDATE_VDDC;

		data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_MCLK;

	}



	dep_table = table_info->vdd_dep_on_sclk;

	odn_dep_table = (struct phm_ppt_v1_clock_voltage_dependency_table *)&(odn_table->vdd_dependency_on_sclk);

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

		if (dep_table->entries[i].vddc != odn_dep_table->entries[i].vddc) {

			data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_VDDC;

			break;

			data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_VDDC | DPMTABLE_OD_UPDATE_SCLK;

			return;

		}

	}

	if (i == dep_table->count)

	if (i == dep_table->count && data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_VDDC) {

		data->need_update_smu7_dpm_table &= ~DPMTABLE_OD_UPDATE_VDDC;

		data->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_SCLK;

	}

}



static int smu7_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,

drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h

+3 −1
Original line number Diff line number Diff line
@@ -412,8 +412,10 @@ typedef struct { 
  QuadraticInt_t    ReservedEquation2;

  QuadraticInt_t    ReservedEquation3;



	uint16_t     MinVoltageUlvGfx;

	uint16_t     MinVoltageUlvSoc;



  uint32_t     Reserved[15];

	uint32_t     Reserved[14];