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

Commit d5227129 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

A few more radeon fixes.  A fix for UVD on AGP cards, a fix for non-full
screen scaling on laptop panels with DP bridge chips, and a bunch of dpm
fixes.

* 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: avoid UVD corruptions on AGP cards
  drm/radeon: fix panel scaling with eDP and LVDS bridges
  drm/radeon/dpm: rework auto performance level enable
  drm/radeon: Fix hmdi typo
  drm/radeon/dpm/rs780: fix force_performance state for same sclks
  drm/radeon/dpm/rs780: don't enable sclk scaling if not required
  drm/radeon/dpm/rs780: add some sanity checking to sclk scaling
  drm/radeon/dpm/rs780: use drm_mode_vrefresh()
parents d2aebe33 4f66c599

drivers/gpu/drm/radeon/btc_dpm.c

+0 −6
Original line number Diff line number Diff line
@@ -2340,12 +2340,6 @@ int btc_dpm_set_power_state(struct radeon_device *rdev) 
		return ret;

	}



	ret = rv770_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);

	if (ret) {

		DRM_ERROR("rv770_dpm_force_performance_level failed\n");

		return ret;

	}



	return 0;

}

drivers/gpu/drm/radeon/ci_dpm.c

+0 −6
Original line number Diff line number Diff line
@@ -4748,12 +4748,6 @@ int ci_dpm_set_power_state(struct radeon_device *rdev) 
	if (pi->pcie_performance_request)

		ci_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps);



	ret = ci_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);

	if (ret) {

		DRM_ERROR("ci_dpm_force_performance_level failed\n");

		return ret;

	}



	cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |

			     RADEON_CG_BLOCK_MC |

			     RADEON_CG_BLOCK_SDMA |

drivers/gpu/drm/radeon/cypress_dpm.c

+0 −6
Original line number Diff line number Diff line
@@ -2014,12 +2014,6 @@ int cypress_dpm_set_power_state(struct radeon_device *rdev) 
	if (eg_pi->pcie_performance_request)

		cypress_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps);



	ret = rv770_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);

	if (ret) {

		DRM_ERROR("rv770_dpm_force_performance_level failed\n");

		return ret;

	}



	return 0;

}

drivers/gpu/drm/radeon/kv_dpm.c

+0 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,6 @@ int kv_dpm_set_power_state(struct radeon_device *rdev) 
			     RADEON_CG_BLOCK_BIF |

			     RADEON_CG_BLOCK_HDP), true);



	rdev->pm.dpm.forced_level = RADEON_DPM_FORCED_LEVEL_AUTO;

	return 0;

}

drivers/gpu/drm/radeon/ni_dpm.c

+0 −6
Original line number Diff line number Diff line
@@ -3865,12 +3865,6 @@ int ni_dpm_set_power_state(struct radeon_device *rdev) 
		return ret;

	}



	ret = ni_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);

	if (ret) {

		DRM_ERROR("ni_dpm_force_performance_level failed\n");

		return ret;

	}



	return 0;

}