system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-22 03:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: allocate kernel channel(s) before initialising display

Browse source 
Some of the pre-NV50 depends on SW methods to implement synchronisation
for page flips, and we want to move this setup out of common code, thus
we require the channel to have been allocation before display init.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2019-02-12 22:28:13 +10:00
parent a8ce8b65e1
commit d7f9bb656e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nouveau_drm.c
View file

@ -504,6 +504,8 @@ nouveau_drm_device_init(struct drm_device *dev)
if (ret) if (ret)
goto fail_bios; goto fail_bios;
nouveau_accel_init(drm);
ret = nouveau_display_create(dev); ret = nouveau_display_create(dev);
if (ret) if (ret)
goto fail_dispctor; goto fail_dispctor;
@ -516,7 +518,6 @@ nouveau_drm_device_init(struct drm_device *dev)
nouveau_debugfs_init(drm); nouveau_debugfs_init(drm);
nouveau_hwmon_init(dev); nouveau_hwmon_init(dev);
nouveau_accel_init(drm);
nouveau_fbcon_init(dev); nouveau_fbcon_init(dev);
nouveau_led_init(dev); nouveau_led_init(dev);
@ -534,6 +535,7 @@ nouveau_drm_device_init(struct drm_device *dev)
fail_dispinit: fail_dispinit:
nouveau_display_destroy(dev); nouveau_display_destroy(dev);
fail_dispctor: fail_dispctor:
nouveau_accel_fini(drm);
nouveau_bios_takedown(dev); nouveau_bios_takedown(dev);
fail_bios: fail_bios:
nouveau_ttm_fini(drm); nouveau_ttm_fini(drm);
@ -559,7 +561,6 @@ nouveau_drm_device_fini(struct drm_device *dev)
nouveau_led_fini(dev); nouveau_led_fini(dev);
nouveau_fbcon_fini(dev); nouveau_fbcon_fini(dev);
nouveau_accel_fini(drm);
nouveau_hwmon_fini(dev); nouveau_hwmon_fini(dev);
nouveau_debugfs_fini(drm); nouveau_debugfs_fini(drm);
@ -567,6 +568,7 @@ nouveau_drm_device_fini(struct drm_device *dev)
nouveau_display_fini(dev, false, false); nouveau_display_fini(dev, false, false);
nouveau_display_destroy(dev); nouveau_display_destroy(dev);
nouveau_accel_fini(drm);
nouveau_bios_takedown(dev); nouveau_bios_takedown(dev);
nouveau_ttm_fini(drm); nouveau_ttm_fini(drm);