diff options
| author | Paolo Bonzini <[email protected]> | 2024-10-06 03:59:22 -0400 | 
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2024-10-06 03:59:22 -0400 | 
| commit | c8d430db8eec7d4fd13a6bea27b7086a54eda6da (patch) | |
| tree | 3c9b35bc9372232183e745cc2a03995a8d053ff6 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | |
| parent | 2a5fe5a01668e831af1de3951718fbf88b9a9b9c (diff) | |
| parent | a1d402abf8e3ff1d821e88993fc5331784fac0da (diff) | |
Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.12, take #1
- Fix pKVM error path on init, making sure we do not change critical
  system registers as we're about to fail
- Make sure that the host's vector length is at capped by a value
  common to all CPUs
- Fix kvm_has_feat*() handling of "negative" features, as the current
  code is pretty broken
- Promote Joey to the status of official reviewer, while James steps
  down -- hopefully only temporarly
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h index f30264782ba2..3a8f57900a3a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h @@ -33,6 +33,8 @@  #define AMDGPU_GEM_DOMAIN_MAX		0x3  #define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, tbo.base) +extern const struct drm_gem_object_funcs amdgpu_gem_object_funcs; +  unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);  /* |