diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-16 03:09:55 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-16 03:09:59 +0300 |
| commit | 03d54ef0a1d5e5115744cb7dc7058e9852228114 (patch) | |
| tree | 440db326e4b3d73b3f8fe5bcfe605eb54039cb41 /drivers/gpu | |
| parent | 8257a0d91310a71e4fa04b9aef8f2c4173ec9fb5 (diff) | |
| parent | 6348dd291e3653534a9e28e6917569bc9967b35b (diff) | |
| download | linux-03d54ef0a1d5e5115744cb7dc7058e9852228114.tar.xz | |
Merge tag 'drm-misc-fixes-2020-07-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
* aspeed: setup fbdev console after registering device; avoids warning
and stacktrace in dmesg log
* dmabuf: protect dmabuf->name with a spinlock; avoids sleeping in
atomic context
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200715171756.GA18606@linux-uq9g
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c index 6b27242b9ee3..bca3fcff16ec 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c @@ -173,8 +173,6 @@ static int aspeed_gfx_load(struct drm_device *drm) drm_mode_config_reset(drm); - drm_fbdev_generic_setup(drm, 32); - return 0; } @@ -225,6 +223,7 @@ static int aspeed_gfx_probe(struct platform_device *pdev) if (ret) goto err_unload; + drm_fbdev_generic_setup(&priv->drm, 32); return 0; err_unload: |