diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-23 20:16:37 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-23 20:16:37 -0400 |
| commit | 718cc664792c4ce436f221fe0e0a26a605308d4b (patch) | |
| tree | 8ef161170059e23358909366081b41a51d04aade | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
| parent | 52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216 (diff) | |
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
* 'linux-4.7' of git://github.com/skeggsb/linux:
drm/nouveau: fix for disabled fbdev emulation
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 300ea03be8f0..d1f248fd3506 100644 --- 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) | |||
| 552 | if (ret) | 552 | if (ret) |
| 553 | goto fini; | 553 | goto fini; |
| 554 | 554 | ||
| 555 | fbcon->helper.fbdev->pixmap.buf_align = 4; | 555 | if (fbcon->helper.fbdev) |
| 556 | fbcon->helper.fbdev->pixmap.buf_align = 4; | ||
| 556 | return 0; | 557 | return 0; |
| 557 | 558 | ||
| 558 | fini: | 559 | fini: |