summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2018-11-14 04:36:03 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2018-11-14 04:36:03 +0000
commitac2d6d9ff8ed1a667078b4c8367f2a9b5e80a101 (patch)
treedf66dec5d9e9000d71f4bf2d386f0c5e34f7172e
parent86110ab3e03be9c4a2e45a940eab9265c57d614d (diff)
Setup radeondrm burner task. Missed when updating to linux 4.4.
Fixes wsconsctl display.screen_off panic reported by Dmitry Murti.
-rw-r--r--sys/dev/pci/drm/radeon/radeon_fb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_fb.c b/sys/dev/pci/drm/radeon/radeon_fb.c
index 2d4f221c0fc..80d91f7e0a9 100644
--- a/sys/dev/pci/drm/radeon/radeon_fb.c
+++ b/sys/dev/pci/drm/radeon/radeon_fb.c
@@ -60,6 +60,7 @@ static struct fb_ops radeonfb_ops = {
};
#endif
+void radeondrm_burner_cb(void *);
int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
{
@@ -381,6 +382,8 @@ int radeon_fbdev_init(struct radeon_device *rdev)
if (ret)
goto free;
+ task_set(&rdev->burner_task, radeondrm_burner_cb, rdev);
+
ret = drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
if (ret)
goto fini;
@@ -406,6 +409,8 @@ void radeon_fbdev_fini(struct radeon_device *rdev)
if (!rdev->mode_info.rfbdev)
return;
+ task_del(systq, &rdev->burner_task);
+
#ifdef notyet
radeon_fbdev_destroy(rdev->ddev, rdev->mode_info.rfbdev);
#endif