projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into...
[linux-drm-fsl-dcu.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_vce.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 3cab96c42aa8843487190248b98d999fb6b3598c..74f2038ac74783a3be14be55a7b0de7e768d61c7 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@
-143,7
+143,7
@@
int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
AMDGPU_GEM_DOMAIN_VRAM,
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
AMDGPU_GEM_DOMAIN_VRAM,
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
- NULL, &adev->vce.vcpu_bo);
+ NULL,
NULL,
&adev->vce.vcpu_bo);
if (r) {
dev_err(adev->dev, "(%d) failed to allocate VCE bo\n", r);
return r;
if (r) {
dev_err(adev->dev, "(%d) failed to allocate VCE bo\n", r);
return r;
@@
-342,10
+342,10
@@
void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp)
}
static int amdgpu_vce_free_job(
}
static int amdgpu_vce_free_job(
- struct amdgpu_job *
sched_
job)
+ struct amdgpu_job *job)
{
{
- amdgpu_ib_free(
sched_job->adev, sched_
job->ibs);
- kfree(
sched_
job->ibs);
+ amdgpu_ib_free(
job->adev,
job->ibs);
+ kfree(job->ibs);
return 0;
}
return 0;
}