projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
33688ab
)
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
author
Dave Airlie
<airlied@redhat.com>
Fri, 24 Jun 2016 00:16:37 +0000
(10:16 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Fri, 24 Jun 2016 00:16:37 +0000
(10:16 +1000)
* 'linux-4.7' of git://github.com/skeggsb/linux:
drm/nouveau: fix for disabled fbdev emulation
drivers/gpu/drm/nouveau/nouveau_fbcon.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index
300ea03
..
d1f248f
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@
-552,7
+552,8
@@
nouveau_fbcon_init(struct drm_device *dev)
if (ret)
goto fini;
- fbcon->helper.fbdev->pixmap.buf_align = 4;
+ if (fbcon->helper.fbdev)
+ fbcon->helper.fbdev->pixmap.buf_align = 4;
return 0;
fini: