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

Commit 45ee2dbc authored by Dave Airlie's avatar Dave Airlie
Browse files

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

two important bug fixes for radeon

* 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix voltage setup on hawaii
  drm/radeon/dp: Set EDP_CONFIGURATION_SET for bridge chips if necessary
parents ab07881a 09b6e85f

drivers/gpu/drm/radeon/atombios_dp.c

+1 −3
Original line number Diff line number Diff line
@@ -623,10 +623,8 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info) 
		drm_dp_dpcd_writeb(dp_info->aux,

				   DP_DOWNSPREAD_CTRL, 0);



	if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

	if (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)

		drm_dp_dpcd_writeb(dp_info->aux, DP_EDP_CONFIGURATION_SET, 1);

	}



	/* set the lane count on the sink */

	tmp = dp_info->dp_lane_count;

drivers/gpu/drm/radeon/radeon_atombios.c

+1 −0
Original line number Diff line number Diff line
@@ -3289,6 +3289,7 @@ int radeon_atom_get_voltage_evv(struct radeon_device *rdev, 


	args.in.ucVoltageType = VOLTAGE_TYPE_VDDC;

	args.in.ucVoltageMode = ATOM_GET_VOLTAGE_EVV_VOLTAGE;

	args.in.usVoltageLevel = cpu_to_le16(virtual_voltage_id);

	args.in.ulSCLKFreq =

		cpu_to_le32(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries[entry_id].clk);