Merge drm/drm-next into drm-misc-next
Picking up v5.0 + missed misc-fixes from last release Signed-off-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
@@ -4869,10 +4869,12 @@ static void ci_request_link_speed_change_before_state_change(struct radeon_devic
|
||||
pi->force_pcie_gen = RADEON_PCIE_GEN2;
|
||||
if (current_link_speed == RADEON_PCIE_GEN2)
|
||||
break;
|
||||
/* fall through */
|
||||
case RADEON_PCIE_GEN2:
|
||||
if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN2, false) == 0)
|
||||
break;
|
||||
#endif
|
||||
/* fall through */
|
||||
default:
|
||||
pi->force_pcie_gen = ci_get_current_pcie_speed(rdev);
|
||||
break;
|
||||
|
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
|
||||
return -EINVAL;
|
||||
}
|
||||
ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
|
||||
break;
|
||||
case CB_TARGET_MASK:
|
||||
track->cb_target_mask = radeon_get_ib_value(p, idx);
|
||||
track->cb_dirty = true;
|
||||
|
@@ -172,6 +172,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
|
||||
}
|
||||
|
||||
if (radeon_is_px(dev)) {
|
||||
dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NEVER_SKIP);
|
||||
pm_runtime_use_autosuspend(dev->dev);
|
||||
pm_runtime_set_autosuspend_delay(dev->dev, 5000);
|
||||
pm_runtime_set_active(dev->dev);
|
||||
|
@@ -5762,10 +5762,12 @@ static void si_request_link_speed_change_before_state_change(struct radeon_devic
|
||||
si_pi->force_pcie_gen = RADEON_PCIE_GEN2;
|
||||
if (current_link_speed == RADEON_PCIE_GEN2)
|
||||
break;
|
||||
/* fall through */
|
||||
case RADEON_PCIE_GEN2:
|
||||
if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN2, false) == 0)
|
||||
break;
|
||||
#endif
|
||||
/* fall through */
|
||||
default:
|
||||
si_pi->force_pcie_gen = si_get_current_pcie_speed(rdev);
|
||||
break;
|
||||
|
مرجع در شماره جدید
Block a user