diff options
Diffstat (limited to 'drivers/gpu/drm/sti/sti_drv.c')
-rw-r--r-- | drivers/gpu/drm/sti/sti_drv.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 832fc43960ee..6dced8abcf16 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c | |||
@@ -121,7 +121,6 @@ err: | |||
121 | 121 | ||
122 | static const struct drm_mode_config_funcs sti_mode_config_funcs = { | 122 | static const struct drm_mode_config_funcs sti_mode_config_funcs = { |
123 | .fb_create = drm_gem_fb_create, | 123 | .fb_create = drm_gem_fb_create, |
124 | .output_poll_changed = drm_fb_helper_output_poll_changed, | ||
125 | .atomic_check = drm_atomic_helper_check, | 124 | .atomic_check = drm_atomic_helper_check, |
126 | .atomic_commit = drm_atomic_helper_commit, | 125 | .atomic_commit = drm_atomic_helper_commit, |
127 | }; | 126 | }; |
@@ -206,7 +205,6 @@ static void sti_cleanup(struct drm_device *ddev) | |||
206 | { | 205 | { |
207 | struct sti_private *private = ddev->dev_private; | 206 | struct sti_private *private = ddev->dev_private; |
208 | 207 | ||
209 | drm_fb_cma_fbdev_fini(ddev); | ||
210 | drm_kms_helper_poll_fini(ddev); | 208 | drm_kms_helper_poll_fini(ddev); |
211 | component_unbind_all(ddev->dev, ddev); | 209 | component_unbind_all(ddev->dev, ddev); |
212 | kfree(private); | 210 | kfree(private); |
@@ -236,11 +234,7 @@ static int sti_bind(struct device *dev) | |||
236 | 234 | ||
237 | drm_mode_config_reset(ddev); | 235 | drm_mode_config_reset(ddev); |
238 | 236 | ||
239 | if (ddev->mode_config.num_connector) { | 237 | drm_fbdev_generic_setup(ddev, 32); |
240 | ret = drm_fb_cma_fbdev_init(ddev, 32, 0); | ||
241 | if (ret) | ||
242 | DRM_DEBUG_DRIVER("Warning: fails to create fbdev\n"); | ||
243 | } | ||
244 | 238 | ||
245 | return 0; | 239 | return 0; |
246 | 240 | ||