diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-29 00:49:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-29 00:49:25 -0700 |
| commit | 2b4e8cbd34b48aa29ef8f7fff9a09d034764eb93 (patch) | |
| tree | b8e30d16af7377e6525eec60501cebd83e9d9669 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 50618ab44f51b26c088a90d4eb3b9a84bde1302b (diff) | |
| parent | 5ab1e18aa3913d454e1bd1498b20ee581aae2c6b (diff) | |
Merge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4""
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 053fc2f465df..bb1099c549df 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1673,7 +1673,6 @@ struct amdgpu_uvd { 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; |