Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a39dbf authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/fb-helper: don't disable everything in initial_config 



This should be done in the drivers for two reasons:
- it gets in the way of fastboot efforts
- it links the fb helpers with the crtc helpers instead of going
  through the real interface vfuncs, forcing i915 to fake all the
  ->disable callbacks used by the crtc helper to avoid ugly Oopsen

v2: Resolve conflicts since drivers still call
drm_fb_helper_single_add_all_connectors.

Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 203cb501

drivers/gpu/drm/ast/ast_fb.c

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>

#include "ast_drv.h"



static void ast_dirty_update(struct ast_fbdev *afbdev,
@@ -314,6 +315,10 @@ int ast_fbdev_init(struct drm_device *dev) 
	}



	drm_fb_helper_single_add_all_connectors(&afbdev->helper);



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	drm_fb_helper_initial_config(&afbdev->helper, 32);

	return 0;

}

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <drm/drmP.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>



#include <linux/fb.h>
@@ -291,6 +292,9 @@ int cirrus_fbdev_init(struct cirrus_device *cdev) 
		return ret;

	}

	drm_fb_helper_single_add_all_connectors(&gfbdev->helper);



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(cdev->dev);

	drm_fb_helper_initial_config(&gfbdev->helper, bpp_sel);



	return 0;

drivers/gpu/drm/drm_fb_cma_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev, 


	}



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(helper, preferred_bpp);

	if (ret < 0) {

		dev_err(dev->dev, "Failed to set inital hw configuration.\n");

drivers/gpu/drm/drm_fb_helper.c

+0 −3
Original line number Diff line number Diff line
@@ -1360,9 +1360,6 @@ bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) 
	struct drm_device *dev = fb_helper->dev;

	int count = 0;



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(fb_helper->dev);



	drm_fb_helper_parse_command_line(fb_helper);



	count = drm_fb_helper_probe_connector_modes(fb_helper,

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+3 −0
Original line number Diff line number Diff line
@@ -295,6 +295,9 @@ int exynos_drm_fbdev_init(struct drm_device *dev) 


	}



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);

	if (ret < 0) {

		DRM_ERROR("failed to set up hw configuration.\n");