|
@@ -799,8 +799,10 @@ int drm_fb_helper_init(struct drm_device *dev,
|
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
|
int i;
|
|
|
|
|
|
- if (!drm_fbdev_emulation)
|
|
|
+ if (!drm_fbdev_emulation) {
|
|
|
+ dev->fb_helper = fb_helper;
|
|
|
return 0;
|
|
|
+ }
|
|
|
|
|
|
if (!max_conn_count)
|
|
|
return -EINVAL;
|
|
@@ -835,6 +837,8 @@ int drm_fb_helper_init(struct drm_device *dev,
|
|
|
i++;
|
|
|
}
|
|
|
|
|
|
+ dev->fb_helper = fb_helper;
|
|
|
+
|
|
|
return 0;
|
|
|
out_free:
|
|
|
drm_fb_helper_crtc_free(fb_helper);
|
|
@@ -913,7 +917,12 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
|
|
|
{
|
|
|
struct fb_info *info;
|
|
|
|
|
|
- if (!drm_fbdev_emulation || !fb_helper)
|
|
|
+ if (!fb_helper)
|
|
|
+ return;
|
|
|
+
|
|
|
+ fb_helper->dev->fb_helper = NULL;
|
|
|
+
|
|
|
+ if (!drm_fbdev_emulation)
|
|
|
return;
|
|
|
|
|
|
cancel_work_sync(&fb_helper->resume_work);
|