diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 19:23:03 +0300 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 19:23:03 +0300 |
| commit | 9635adf8541ae9cbead19d769dce2c945fa88de6 (patch) | |
| tree | acab90e8fb7c2e4c04a39d72d51a55bf8b1e8b8f /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | 1ec23ed7126e6b8fab287598576e84e26e6482ef (diff) | |
| parent | 045e8d102f44ad75dca0b0ec9eede15ea89da673 (diff) | |
| download | linux-9635adf8541ae9cbead19d769dce2c945fa88de6.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
Lets eradicate a silent conflict between drm-intel-next and
drm-intel-gt-next which added a duplicate function (try_firmware_load).
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 4e684c2afc70..25a68d8888e0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -470,8 +470,9 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, return true; fail: - DRM_DEBUG("BO size %lu > total memory in domain: %llu\n", size, - man->size); + if (man) + DRM_DEBUG("BO size %lu > total memory in domain: %llu\n", size, + man->size); return false; } |