diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-01-27 09:56:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:56:13 +1000 |
| commit | 5159571ceb44eba9bf9f9a34ec625386d421de9c (patch) | |
| tree | d8e72dc8a007003a5f0ec228b7de5c30e9ed2260 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | Merge tag 'drm-amdkfd-fixes-2015-01-26' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes (diff) | |
| parent | drm/radeon: Remove rdev->gart.pages_addr array (diff) | |
| download | linux-dev-5159571ceb44eba9bf9f9a34ec625386d421de9c.tar.xz linux-dev-5159571ceb44eba9bf9f9a34ec625386d421de9c.zip | |
Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Suspend/resume regression fix for 3.19.
* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Remove rdev->gart.pages_addr array
drm/radeon: Restore GART table contents after pinning it in VRAM v3
drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 0ec65168f331..bd7519fdd3f4 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -774,6 +774,8 @@ int radeon_dummy_page_init(struct radeon_device *rdev) rdev->dummy_page.page = NULL; return -ENOMEM; } + rdev->dummy_page.entry = radeon_gart_get_page_entry(rdev->dummy_page.addr, + RADEON_GART_PAGE_DUMMY); return 0; } |