diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-02-16 13:55:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-02-16 13:55:49 +1000 |
| commit | 45ee2dbc65cbf6910892c480e6f428be342fa733 (patch) | |
| tree | a0d957a153bd56117bd13f93027f2763f80efdb0 | |
| parent | ab07881a2a51ccc55ecfb128094f57101d0669a8 (diff) | |
| parent | 09b6e85fc868568e1b2820235a2a851aecbccfcc (diff) | |
| download | talos-op-linux-45ee2dbc65cbf6910892c480e6f428be342fa733.tar.gz talos-op-linux-45ee2dbc65cbf6910892c480e6f428be342fa733.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index db42a670f995..5bf825dfaa09 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -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; diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index dbc94f300297..fc1b3f34cf18 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -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); |
