diff options
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 954d175bd7fa..82c3a9ff80a5 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -245,7 +245,7 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper) | |||
245 | int i, ret; | 245 | int i, ret; |
246 | for (i = 0; i < fb_helper->crtc_count; i++) { | 246 | for (i = 0; i < fb_helper->crtc_count; i++) { |
247 | struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; | 247 | struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; |
248 | ret = mode_set->crtc->funcs->set_config(mode_set); | 248 | ret = drm_mode_set_config_internal(mode_set); |
249 | if (ret) | 249 | if (ret) |
250 | error = true; | 250 | error = true; |
251 | } | 251 | } |
@@ -675,7 +675,7 @@ int drm_fb_helper_set_par(struct fb_info *info) | |||
675 | mutex_lock(&dev->mode_config.mutex); | 675 | mutex_lock(&dev->mode_config.mutex); |
676 | for (i = 0; i < fb_helper->crtc_count; i++) { | 676 | for (i = 0; i < fb_helper->crtc_count; i++) { |
677 | crtc = fb_helper->crtc_info[i].mode_set.crtc; | 677 | crtc = fb_helper->crtc_info[i].mode_set.crtc; |
678 | ret = crtc->funcs->set_config(&fb_helper->crtc_info[i].mode_set); | 678 | ret = drm_mode_set_config_internal(&fb_helper->crtc_info[i].mode_set); |
679 | if (ret) { | 679 | if (ret) { |
680 | mutex_unlock(&dev->mode_config.mutex); | 680 | mutex_unlock(&dev->mode_config.mutex); |
681 | return ret; | 681 | return ret; |
@@ -711,7 +711,7 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, | |||
711 | modeset->y = var->yoffset; | 711 | modeset->y = var->yoffset; |
712 | 712 | ||
713 | if (modeset->num_connectors) { | 713 | if (modeset->num_connectors) { |
714 | ret = crtc->funcs->set_config(modeset); | 714 | ret = drm_mode_set_config_internal(modeset); |
715 | if (!ret) { | 715 | if (!ret) { |
716 | info->var.xoffset = var->xoffset; | 716 | info->var.xoffset = var->xoffset; |
717 | info->var.yoffset = var->yoffset; | 717 | info->var.yoffset = var->yoffset; |