diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-12-13 02:32:41 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-12-13 02:33:50 +0300 |
| commit | b5f436e7b4c2fcdb96204dbba346bddc7fc3e850 (patch) | |
| tree | 532feaaa4d1f74df0a4203c94d2d642b891cec45 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | 26eacb788b7e37f9b08e6e6fc9686bf0817c0163 (diff) | |
| parent | 24199c5436f267399afed0c4f1f57663c0408f57 (diff) | |
| download | linux-b5f436e7b4c2fcdb96204dbba346bddc7fc3e850.tar.xz | |
Merge branch 'linux-4.20' of git://github.com/skeggsb/linux into drm-fixes
Three fixes:
tegra regression fix
display flushing fix
mst cleanup fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7WCPzjQZonk+eS1FgEUKirz-4LOrVpMUVMM=D-GjbVpg@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 2b2baf6e0e0d..d2928d43f29a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1171,10 +1171,16 @@ nouveau_platform_device_create(const struct nvkm_device_tegra_func *func, goto err_free; } + err = nouveau_drm_device_init(drm); + if (err) + goto err_put; + platform_set_drvdata(pdev, drm); return drm; +err_put: + drm_dev_put(drm); err_free: nvkm_device_del(pdevice); |