diff options
author | Dave Airlie <airlied@redhat.com> | 2017-01-09 17:06:56 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-01-09 17:06:56 -0500 |
commit | 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897 (patch) | |
tree | 2a2242f3d257098fd52b7bd83dfd8271cdf9e082 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | 5c37daf5dd2e63090abba4ea200b56176f6e4781 (diff) | |
parent | a009e975da5c7d42a7f5eaadc54946eb5f76c9af (diff) |
Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Back to regular -misc pulls with reasonable sizes:
- dma_fence error clarification (Chris)
- drm_crtc_from_index helper (Shawn), pile more patches on the m-l to roll
this out to drivers
- mmu-less support for fbdev helpers from Benjamin
- piles of kerneldoc work
- some polish for crc support from Tomeu and Benjamin
- odd misc stuff all over
* tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc: (48 commits)
dma-fence: Introduce drm_fence_set_error() helper
dma-fence: Wrap querying the fence->status
dma-fence: Clear fence->status during dma_fence_init()
drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"
drm: Change the return type of the unload hook to void
drm: add more document for drm_crtc_from_index()
drm: remove useless parameters from drm_pick_cmdline_mode function
drm: crc: Call wake_up_interruptible() each time there is a new CRC entry
drm: allow to use mmuless SoC
drm: compile drm_vm.c only when needed
fbmem: add a default get_fb_unmapped_area function
drm: crc: Wait for a frame before returning from open()
drm: Move locking into drm_debugfs_crtc_crc_add
drm/imx: imx-tve: Remove unused variable
Revert "drm: nouveau: fix build when LEDS_CLASS=m"
drm: Add kernel-doc for drm_crtc_commit_get/put
drm/atomic: Fix outdated comment.
drm: reference count event->completion
gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
drm: Document deprecated load/unload hook
...
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 8e35c1ff59e3..c695b6c55361 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -1482,18 +1482,18 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data) | |||
1482 | struct drm_device *dev = node->minor->dev; | 1482 | struct drm_device *dev = node->minor->dev; |
1483 | struct amdgpu_device *adev = dev->dev_private; | 1483 | struct amdgpu_device *adev = dev->dev_private; |
1484 | struct drm_mm *mm = (struct drm_mm *)adev->mman.bdev.man[ttm_pl].priv; | 1484 | struct drm_mm *mm = (struct drm_mm *)adev->mman.bdev.man[ttm_pl].priv; |
1485 | int ret; | ||
1486 | struct ttm_bo_global *glob = adev->mman.bdev.glob; | 1485 | struct ttm_bo_global *glob = adev->mman.bdev.glob; |
1486 | struct drm_printer p = drm_seq_file_printer(m); | ||
1487 | 1487 | ||
1488 | spin_lock(&glob->lru_lock); | 1488 | spin_lock(&glob->lru_lock); |
1489 | ret = drm_mm_dump_table(m, mm); | 1489 | drm_mm_print(mm, &p); |
1490 | spin_unlock(&glob->lru_lock); | 1490 | spin_unlock(&glob->lru_lock); |
1491 | if (ttm_pl == TTM_PL_VRAM) | 1491 | if (ttm_pl == TTM_PL_VRAM) |
1492 | seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n", | 1492 | seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n", |
1493 | adev->mman.bdev.man[ttm_pl].size, | 1493 | adev->mman.bdev.man[ttm_pl].size, |
1494 | (u64)atomic64_read(&adev->vram_usage) >> 20, | 1494 | (u64)atomic64_read(&adev->vram_usage) >> 20, |
1495 | (u64)atomic64_read(&adev->vram_vis_usage) >> 20); | 1495 | (u64)atomic64_read(&adev->vram_vis_usage) >> 20); |
1496 | return ret; | 1496 | return 0; |
1497 | } | 1497 | } |
1498 | 1498 | ||
1499 | static int ttm_pl_vram = TTM_PL_VRAM; | 1499 | static int ttm_pl_vram = TTM_PL_VRAM; |