diff mbox

drm/fb-helper: Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par()

Message ID 1393445763-9770-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Feb. 26, 2014, 8:16 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par() to
make sure extra planes get disabled whenever fbcon takes over.

Otherwise the code in drm_fb_helper_set_par() was already doing the
exact same thing as drm_fb_helper_restore_fbdev_mode(), so this doesn't
change the behaviour in any other way.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Daniel Vetter March 4, 2014, 9:49 a.m. UTC | #1 
On Wed, Feb 26, 2014 at 10:16:03PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par() to
> make sure extra planes get disabled whenever fbcon takes over.
> 
> Otherwise the code in drm_fb_helper_set_par() was already doing the
> exact same thing as drm_fb_helper_restore_fbdev_mode(), so this doesn't
> change the behaviour in any other way.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Prep work for atomic modeset, yay!

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/drm_fb_helper.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index d99df15..ca100d6 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -809,8 +809,6 @@ int drm_fb_helper_set_par(struct fb_info *info)
>  	struct drm_fb_helper *fb_helper = info->par;
>  	struct drm_device *dev = fb_helper->dev;
>  	struct fb_var_screeninfo *var = &info->var;
> -	int ret;
> -	int i;
>  
>  	if (var->pixclock != 0) {
>  		DRM_ERROR("PIXEL CLOCK SET\n");
> @@ -818,13 +816,7 @@ int drm_fb_helper_set_par(struct fb_info *info)
>  	}
>  
>  	drm_modeset_lock_all(dev);
> -	for (i = 0; i < fb_helper->crtc_count; i++) {
> -		ret = drm_mode_set_config_internal(&fb_helper->crtc_info[i].mode_set);
> -		if (ret) {
> -			drm_modeset_unlock_all(dev);
> -			return ret;
> -		}
> -	}
> +	drm_fb_helper_restore_fbdev_mode(fb_helper);
>  	drm_modeset_unlock_all(dev);
>  
>  	if (fb_helper->delayed_hotplug) {
> -- 
> 1.8.3.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index d99df15..ca100d6 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -809,8 +809,6 @@  int drm_fb_helper_set_par(struct fb_info *info)
 	struct drm_fb_helper *fb_helper = info->par;
 	struct drm_device *dev = fb_helper->dev;
 	struct fb_var_screeninfo *var = &info->var;
-	int ret;
-	int i;
 
 	if (var->pixclock != 0) {
 		DRM_ERROR("PIXEL CLOCK SET\n");
@@ -818,13 +816,7 @@  int drm_fb_helper_set_par(struct fb_info *info)
 	}
 
 	drm_modeset_lock_all(dev);
-	for (i = 0; i < fb_helper->crtc_count; i++) {
-		ret = drm_mode_set_config_internal(&fb_helper->crtc_info[i].mode_set);
-		if (ret) {
-			drm_modeset_unlock_all(dev);
-			return ret;
-		}
-	}
+	drm_fb_helper_restore_fbdev_mode(fb_helper);
 	drm_modeset_unlock_all(dev);
 
 	if (fb_helper->delayed_hotplug) {