diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-06-06 13:47:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-06 14:28:26 +1000 |
| commit | 396f9acaffd87e44b8b02bc60f06dc949b832b7e (patch) | |
| tree | 768e7132f18b4d780c7b02ae322c8c0782cfc28f /Documentation/gpu | |
| parent | Merge tag 'drm-misc-next-2019-06-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Revert "drm/amdgpu: add DRIVER_SYNCOBJ_TIMELINE to amdgpu" (diff) | |
| download | linux-dev-396f9acaffd87e44b8b02bc60f06dc949b832b7e.tar.xz linux-dev-396f9acaffd87e44b8b02bc60f06dc949b832b7e.zip | |
Merge branch 'drm-next-5.3' of git://people.freedesktop.org/~agd5f/linux into drm-next
amdgpu:
- Revert timeline support until KHR is ready
- Various driver reload fixes
- Refactor clock handling in DC
- Aux fixes for DC
- Bandwidth calculation updates for DC
- Fix documentation due to file rename
- RAS fix
- Fix race in late_init
ttm:
- Allow for better forward progress when there is heavy memory contention
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190606032537.6939-1-alexander.deucher@amd.com
Diffstat (limited to 'Documentation/gpu')
| -rw-r--r-- | Documentation/gpu/amdgpu.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gpu/amdgpu.rst b/Documentation/gpu/amdgpu.rst index 86138798128f..5acdd1842ea2 100644 --- a/Documentation/gpu/amdgpu.rst +++ b/Documentation/gpu/amdgpu.rst @@ -37,10 +37,10 @@ Buffer Objects PRIME Buffer Sharing -------------------- -.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c :doc: PRIME Buffer Sharing -.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c :internal: MMU Notifier |