git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
vce_v4_0.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
index 9fb34b7d8e03e88f411dcf369a79d4853aaef897..aadc3e66ebd7c1164c359f8e13afb12deec4c46d 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
@@
-947,7
+947,7
@@
static int vce_v4_0_set_powergating_state(void *handle,
#endif
static void vce_v4_0_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *job,
- struct amdgpu_ib *ib,
bool ctx_switch
)
+ struct amdgpu_ib *ib,
uint32_t flags
)
{
unsigned vmid = AMDGPU_JOB_GET_VMID(job);