Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu.h
diff --git
a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index
bb1099c
..
e8e962f
100644
(file)
--- a/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@
-532,6
+532,7
@@
struct amdgpu_bo {
u64 metadata_flags;
void *metadata;
u32 metadata_size;
u64 metadata_flags;
void *metadata;
u32 metadata_size;
+ unsigned prime_shared_count;
/* list of all virtual address to which this bo
* is associated to
*/
/* list of all virtual address to which this bo
* is associated to
*/
@@
-710,9
+711,9
@@
int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev);
void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);
int amdgpu_gart_init(struct amdgpu_device *adev);
void amdgpu_gart_fini(struct amdgpu_device *adev);
void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);
int amdgpu_gart_init(struct amdgpu_device *adev);
void amdgpu_gart_fini(struct amdgpu_device *adev);
-void amdgpu_gart_unbind(struct amdgpu_device *adev, u
nsigned
offset,
+void amdgpu_gart_unbind(struct amdgpu_device *adev, u
int64_t
offset,
int pages);
int pages);
-int amdgpu_gart_bind(struct amdgpu_device *adev, u
nsigned
offset,
+int amdgpu_gart_bind(struct amdgpu_device *adev, u
int64_t
offset,
int pages, struct page **pagelist,
dma_addr_t *dma_addr, uint32_t flags);
int pages, struct page **pagelist,
dma_addr_t *dma_addr, uint32_t flags);
@@
-1673,6
+1674,7
@@
struct amdgpu_uvd {
struct amdgpu_bo *vcpu_bo;
void *cpu_addr;
uint64_t gpu_addr;
struct amdgpu_bo *vcpu_bo;
void *cpu_addr;
uint64_t gpu_addr;
+ unsigned fw_version;
atomic_t handles[AMDGPU_MAX_UVD_HANDLES];
struct drm_file *filp[AMDGPU_MAX_UVD_HANDLES];
struct delayed_work idle_work;
atomic_t handles[AMDGPU_MAX_UVD_HANDLES];
struct drm_file *filp[AMDGPU_MAX_UVD_HANDLES];
struct delayed_work idle_work;