tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-3
+1
-3
drivers/gpu/drm/radeon/atombios_dp.c
+1
-3
drivers/gpu/drm/radeon/atombios_dp.c
···
623
623
drm_dp_dpcd_writeb(dp_info->aux,
624
624
DP_DOWNSPREAD_CTRL, 0);
625
625
626
-
if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
627
-
(dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
626
+
if (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)
628
627
drm_dp_dpcd_writeb(dp_info->aux, DP_EDP_CONFIGURATION_SET, 1);
629
-
}
630
628
631
629
/* set the lane count on the sink */
632
630
tmp = dp_info->dp_lane_count;
+1
drivers/gpu/drm/radeon/radeon_atombios.c
+1
drivers/gpu/drm/radeon/radeon_atombios.c
···
3289
3289
3290
3290
args.in.ucVoltageType = VOLTAGE_TYPE_VDDC;
3291
3291
args.in.ucVoltageMode = ATOM_GET_VOLTAGE_EVV_VOLTAGE;
3292
+
args.in.usVoltageLevel = cpu_to_le16(virtual_voltage_id);
3292
3293
args.in.ulSCLKFreq =
3293
3294
cpu_to_le32(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries[entry_id].clk);
3294
3295