Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
#include "amdgpu_hmm.h"
#include "amdgpu_xgmi.h"

#ifdef CONFIG_ARCH_PHYTIUM
#include <asm/phytium_cputype.h>
#endif

static const struct drm_gem_object_funcs amdgpu_gem_object_funcs;

static vm_fault_t amdgpu_gem_fault(struct vm_fault *vmf)
Expand Down Expand Up @@ -258,6 +262,11 @@ static int amdgpu_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_str
!(vma->vm_flags & VM_ACCESS_FLAGS))
vm_flags_clear(vma, VM_MAYWRITE);

#ifdef CONFIG_ARCH_PHYTIUM
/*lt: workaround for bad address error with d3d11 api remoting*/
if (is_phytium_soc())
vm_flags_set(vma, VM_ALLOW_ANY_UNCACHED);
#endif
return drm_gem_ttm_mmap(obj, vma);
}

Expand Down
8 changes: 6 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1148,8 +1148,10 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev,
if (ret)
return ret;

for (i = 0; i < ttm->num_pages; ++i)
for (i = 0; i < ttm->num_pages; ++i) {
ttm->pages[i]->mapping = bdev->dev_mapping;
page_ref_inc(ttm->pages[i]);
}

return 0;
}
Expand Down Expand Up @@ -1180,8 +1182,10 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev,
if (ttm->page_flags & TTM_TT_FLAG_EXTERNAL)
return;

for (i = 0; i < ttm->num_pages; ++i)
for (i = 0; i < ttm->num_pages; ++i) {
ttm->pages[i]->mapping = NULL;
page_ref_dec(ttm->pages[i]);
}

adev = amdgpu_ttm_adev(bdev);

Expand Down
Loading