Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358193
b: refs/heads/master
c: 8fcb6c4
h: refs/heads/master
i:
  358191: 548ee1f
v: v3
  • Loading branch information
Daniel Vetter authored and Dave Airlie committed Feb 19, 2013
1 parent c79c29c commit 2e007c4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e26875e21f7b01787018cbc0faf8bd099599cdb
refs/heads/master: 8fcb6c4748822f8f594536e47b9b0701b6c33e7a
9 changes: 6 additions & 3 deletions trunk/drivers/gpu/drm/drm_fb_cma_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,13 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
*/
void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
{
drm_modeset_lock_all(dev);
if (fbdev_cma)
if (fbdev_cma) {
struct drm_device *dev = fbdev_cma->fb_helper.dev;

drm_modeset_lock_all(dev);
drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper);
drm_modeset_unlock_all(dev);
drm_modeset_unlock_all(dev);
}
}
EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);

Expand Down

0 comments on commit 2e007c4

Please sign in to comment.