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

Commit 2f1046f3 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm: export cmdline and preferred mode functions from fb helper 



This allows drivers to use them in custom initial_config functions.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bbb5eebf

drivers/gpu/drm/drm_fb_helper.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1136,7 +1136,7 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, 
	return count;

	return count;

}

}





static struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)

struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)

{

{

	struct drm_display_mode *mode;

	struct drm_display_mode *mode;
@@ -1149,6 +1149,7 @@ static struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_conn 
	}

	}

	return NULL;

	return NULL;

}

}

EXPORT_SYMBOL(drm_has_preferred_mode);





static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)

static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)

{

{
@@ -1157,7 +1158,7 @@ static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector) 
	return cmdline_mode->specified;

	return cmdline_mode->specified;

}

}





static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

						      int width, int height)

						      int width, int height)

{

{

	struct drm_cmdline_mode *cmdline_mode;

	struct drm_cmdline_mode *cmdline_mode;
@@ -1197,6 +1198,7 @@ static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_conne 
	list_add(&mode->head, &fb_helper_conn->connector->modes);

	list_add(&mode->head, &fb_helper_conn->connector->modes);

	return mode;

	return mode;

}

}

EXPORT_SYMBOL(drm_pick_cmdline_mode);





static bool drm_connector_enabled(struct drm_connector *connector, bool strict)

static bool drm_connector_enabled(struct drm_connector *connector, bool strict)

{

{

include/drm/drm_fb_helper.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -121,5 +121,11 @@ bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); 
int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);

int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);

int drm_fb_helper_debug_enter(struct fb_info *info);

int drm_fb_helper_debug_enter(struct fb_info *info);

int drm_fb_helper_debug_leave(struct fb_info *info);

int drm_fb_helper_debug_leave(struct fb_info *info);

struct drm_display_mode *

drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,

			int width, int height);

struct drm_display_mode *

drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

		      int width, int height);





#endif
 
#endif