diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fb.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index b4948021e345..e192acfbf0cd 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -316,16 +316,9 @@ int radeon_parse_options(char *options) | |||
316 | return 0; | 316 | return 0; |
317 | } | 317 | } |
318 | 318 | ||
319 | void radeonfb_hotplug(struct drm_device *dev, bool polled) | 319 | void radeon_fb_output_poll_changed(struct radeon_device *rdev) |
320 | { | 320 | { |
321 | struct radeon_device *rdev = dev->dev_private; | 321 | drm_fb_helper_hotplug_event(&rdev->mode_info.rfbdev->helper); |
322 | |||
323 | drm_helper_fb_hpd_irq_event(&rdev->mode_info.rfbdev->helper); | ||
324 | } | ||
325 | |||
326 | static void radeon_fb_output_status_changed(struct drm_fb_helper *fb_helper) | ||
327 | { | ||
328 | drm_helper_fb_hotplug_event(fb_helper, true); | ||
329 | } | 322 | } |
330 | 323 | ||
331 | static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev) | 324 | static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev) |
@@ -364,7 +357,6 @@ static struct drm_fb_helper_funcs radeon_fb_helper_funcs = { | |||
364 | .gamma_set = radeon_crtc_fb_gamma_set, | 357 | .gamma_set = radeon_crtc_fb_gamma_set, |
365 | .gamma_get = radeon_crtc_fb_gamma_get, | 358 | .gamma_get = radeon_crtc_fb_gamma_get, |
366 | .fb_probe = radeon_fb_find_or_create_single, | 359 | .fb_probe = radeon_fb_find_or_create_single, |
367 | .fb_output_status_changed = radeon_fb_output_status_changed, | ||
368 | }; | 360 | }; |
369 | 361 | ||
370 | int radeon_fbdev_init(struct radeon_device *rdev) | 362 | int radeon_fbdev_init(struct radeon_device *rdev) |
@@ -386,11 +378,10 @@ int radeon_fbdev_init(struct radeon_device *rdev) | |||
386 | 378 | ||
387 | drm_fb_helper_init(rdev->ddev, &rfbdev->helper, | 379 | drm_fb_helper_init(rdev->ddev, &rfbdev->helper, |
388 | rdev->num_crtc, | 380 | rdev->num_crtc, |
389 | RADEONFB_CONN_LIMIT, true); | 381 | RADEONFB_CONN_LIMIT); |
390 | drm_fb_helper_single_add_all_connectors(&rfbdev->helper); | 382 | drm_fb_helper_single_add_all_connectors(&rfbdev->helper); |
391 | drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel); | 383 | drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel); |
392 | return 0; | 384 | return 0; |
393 | |||
394 | } | 385 | } |
395 | 386 | ||
396 | void radeon_fbdev_fini(struct radeon_device *rdev) | 387 | void radeon_fbdev_fini(struct radeon_device *rdev) |