projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_device.c
diff --git
a/drivers/gpu/drm/radeon/radeon_device.c
b/drivers/gpu/drm/radeon/radeon_device.c
index
ea26769
..
995a8b1
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_device.c
+++ b/
drivers/gpu/drm/radeon/radeon_device.c
@@
-952,6
+952,7
@@
int radeon_atombios_init(struct radeon_device *rdev)
}
mutex_init(&rdev->mode_info.atom_context->mutex);
+ mutex_init(&rdev->mode_info.atom_context->scratch_mutex);
radeon_atom_initialize_bios_scratch_regs(rdev->ddev);
atom_allocate_fb_scratch(rdev->mode_info.atom_context);
return 0;