diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-02-28 11:39:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-02-28 11:39:52 +1000 |
| commit | 219b3b22df9d828367a4eeceed7600890e2ff4ef (patch) | |
| tree | ea7a671b56f792b21723788d5dfea0de1e3f96e5 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | 4a3928c6f8a53fa1aed28ccba227742486e8ddcb (diff) | |
| parent | 2c83029cda55a5e7665c7c6326909427d6a01350 (diff) | |
| download | talos-op-linux-219b3b22df9d828367a4eeceed7600890e2ff4ef.tar.gz talos-op-linux-219b3b22df9d828367a4eeceed7600890e2ff4ef.zip | |
Merge branch 'drm-fixes-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- Powerplay fixes for cards with no displays attached
- Couple of DC fixes
- radeon workaround for PPC64
* 'drm-fixes-4.16' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: insist on 32-bit DMA for Cedar on PPC64/PPC64LE
drm/amd/display: VGA black screen from s3 when attached to hook
drm/amdgpu: Unify the dm resume calls into one
drm/amdgpu: Add a missing lock for drm_mm_takedown
Revert "drm/radeon/pm: autoswitch power state when in balanced mode"
drm/amd/powerplay/smu7: allow mclk switching with no displays
drm/amd/powerplay/vega10: allow mclk switching with no displays
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 8d3e3d2e0090..7828a5e10629 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1365,6 +1365,10 @@ int radeon_device_init(struct radeon_device *rdev, if ((rdev->flags & RADEON_IS_PCI) && (rdev->family <= CHIP_RS740)) rdev->need_dma32 = true; +#ifdef CONFIG_PPC64 + if (rdev->family == CHIP_CEDAR) + rdev->need_dma32 = true; +#endif dma_bits = rdev->need_dma32 ? 32 : 40; r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); |
