diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2016-10-30 06:43:43 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2016-10-30 06:43:43 -0400 |
| commit | bb41d2a51f0ed379cbe6b2f73271688784c40a1a (patch) | |
| tree | 8c414a77b6977e23fdefad009f72f97ae9d33e14 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | driver core: Add a wrapper around __device_release_driver() (diff) | |
| parent | Linux 4.9-rc3 (diff) | |
| download | linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.tar.gz linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.tar.bz2 linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.zip | |
Merge 4.9-rc3 into driver-core-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index be30861afae9..41b72ce6613f 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -446,6 +446,10 @@ void radeon_bo_force_delete(struct radeon_device *rdev) int radeon_bo_init(struct radeon_device *rdev) { + /* reserve PAT memory space to WC for VRAM */ + arch_io_reserve_memtype_wc(rdev->mc.aper_base, + rdev->mc.aper_size); + /* Add an MTRR for the VRAM */ if (!rdev->fastfb_working) { rdev->mc.vram_mtrr = arch_phys_wc_add(rdev->mc.aper_base, @@ -463,6 +467,7 @@ void radeon_bo_fini(struct radeon_device *rdev) { radeon_ttm_fini(rdev); arch_phys_wc_del(rdev->mc.vram_mtrr); + arch_io_free_memtype_wc(rdev->mc.aper_base, rdev->mc.aper_size); } /* Returns how many bytes TTM can move per IB. |