Commit 88fff0b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-07-24' of git://anongit.freedesktop.org/drm/drm into master 

Pull drm fixes from Dave Airlie:
 "Quiet fixes, I may have a single regression fix follow up to this for
  nouveau, but it might be next week, Ben was testing it a bit more .

  Otherwise two amdgpu fixes, one lima and one sun4i:

  amdgpu:
    - Fix crash when overclocking VegaM
    - Fix possible crash when editing dpm levels

  sun4i:
    - Fix inverted HPD result; fixes an earlier fix

  lima:
    - fix timeout during reset"

* tag 'drm-fixes-2020-07-24' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu: Fix NULL dereference in dpm sysfs handlers
  drm/amd/powerplay: fix a crash when overclocking Vega M
  drm/lima: fix wait pp reset timeout
  drm: sun4i: hdmi: Fix inverted HPD result
parents f37e99ac d8904ca9

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

+3 −6
Original line number Diff line number Diff line
@@ -778,8 +778,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, 
		tmp_str++;

	while (isspace(*++tmp_str));



	while (tmp_str[0]) {

		sub_str = strsep(&tmp_str, delimiter);

	while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

		if (ret)

			return -EINVAL;
@@ -1039,8 +1038,7 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask) 
	memcpy(buf_cpy, buf, bytes);

	buf_cpy[bytes] = '\0';

	tmp = buf_cpy;

	while (tmp[0]) {

		sub_str = strsep(&tmp, delimiter);

	while ((sub_str = strsep(&tmp, delimiter)) != NULL) {

		if (strlen(sub_str)) {

			ret = kstrtol(sub_str, 0, &level);

			if (ret)
@@ -1637,8 +1635,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, 
			i++;

		memcpy(buf_cpy, buf, count-i);

		tmp_str = buf_cpy;

		while (tmp_str[0]) {

			sub_str = strsep(&tmp_str, delimiter);

		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

			ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

			if (ret)

				return -EINVAL;

drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c

+6 −4
Original line number Diff line number Diff line
@@ -644,9 +644,6 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, 


	/* sclk is bigger than max sclk in the dependence table */

	*voltage |= (dep_table->entries[i - 1].vddc * VOLTAGE_SCALE) << VDDC_SHIFT;

	vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),

			(dep_table->entries[i - 1].vddc -

					(uint16_t)VDDC_VDDCI_DELTA));



	if (SMU7_VOLTAGE_CONTROL_NONE == data->vddci_control)

		*voltage |= (data->vbios_boot_state.vddci_bootup_value *
@@ -654,8 +651,13 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, 
	else if (dep_table->entries[i - 1].vddci)

		*voltage |= (dep_table->entries[i - 1].vddci *

				VOLTAGE_SCALE) << VDDC_SHIFT;

	else

	else {

		vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),

				(dep_table->entries[i - 1].vddc -

						(uint16_t)VDDC_VDDCI_DELTA));



		*voltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;

	}



	if (SMU7_VOLTAGE_CONTROL_NONE == data->mvdd_control)

		*mvdd = data->vbios_boot_state.mvdd_bootup_value * VOLTAGE_SCALE;

drivers/gpu/drm/lima/lima_pp.c

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ void lima_pp_fini(struct lima_ip *ip) 


int lima_pp_bcast_resume(struct lima_ip *ip)

{

	/* PP has been reset by individual PP resume */

	ip->data.async_reset = false;

	return 0;

}

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force) 
	unsigned long reg;



	reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);

	if (reg & SUN4I_HDMI_HPD_HIGH) {

	if (!(reg & SUN4I_HDMI_HPD_HIGH)) {

		cec_phys_addr_invalidate(hdmi->cec_adap);

		return connector_status_disconnected;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE