Commit eaf99c74 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Perform cmdline mode parsing during connector initialisation 

i915.ko has a custom fbdev initialisation routine that aims to preserve
the current mode set by the BIOS, unless overruled by the user. The
user's wishes are determined by what, if any, mode is specified on the
command line (via the video= parameter). However, that command line mode
is first parsed by drm_fb_helper_initial_config() which is called after
i915.ko's custom initial_config() as a fallback method. So in order for
us to honour it, we need to move the cmdline parser earlier. If we
perform the connector cmdline parsing as soon as we initialise the
connector, that cmdline mode and forced status is then available even if
the fbdev helper is not compiled in or never called.

We also then expose the cmdline user mode in the connector mode lists.

v2: Rebase after connector->name upheaval.

v3: Adapt mga200 to look for the cmdline mode in the new place. Nicely
simplifies things while at that.

v4: Fix checkpatch.

v5: Select FB_CMDLINE to adapt to the changed fbdev patch.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73154


Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (v2)
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> (v2)
Cc: dri-devel@lists.freedesktop.org
Cc: Julia Lemire <jlemire@matrox.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ea6763c1

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ menuconfig DRM 
	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"

	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU && HAS_DMA

	select HDMI

	select FB_CMDLINE

	select I2C

	select I2C_ALGOBIT

	select DMA_SHARED_BUFFER

drivers/gpu/drm/drm_crtc.c

+55 −0
Original line number Diff line number Diff line
@@ -862,6 +862,59 @@ static void drm_mode_remove(struct drm_connector *connector, 
	drm_mode_destroy(connector->dev, mode);

}



/**

 * drm_connector_get_cmdline_mode - reads the user's cmdline mode

 * @connector: connector to quwery

 * @mode: returned mode

 *

 * The kernel supports per-connector configration of its consoles through

 * use of the video= parameter. This function parses that option and

 * extracts the user's specified mode (or enable/disable status) for a

 * particular connector. This is typically only used during the early fbdev

 * setup.

 */

static void drm_connector_get_cmdline_mode(struct drm_connector *connector)

{

	struct drm_cmdline_mode *mode = &connector->cmdline_mode;

	char *option = NULL;



	if (fb_get_options(connector->name, &option))

		return;



	if (!drm_mode_parse_command_line_for_connector(option,

						       connector,

						       mode))

		return;



	if (mode->force) {

		const char *s;



		switch (mode->force) {

		case DRM_FORCE_OFF:

			s = "OFF";

			break;

		case DRM_FORCE_ON_DIGITAL:

			s = "ON - dig";

			break;

		default:

		case DRM_FORCE_ON:

			s = "ON";

			break;

		}



		DRM_INFO("forcing %s connector %s\n", connector->name, s);

		connector->force = mode->force;

	}



	DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",

		      connector->name,

		      mode->xres, mode->yres,

		      mode->refresh_specified ? mode->refresh : 60,

		      mode->rb ? " reduced blanking" : "",

		      mode->margins ? " with margins" : "",

		      mode->interlace ?  " interlaced" : "");

}



/**

 * drm_connector_init - Init a preallocated connector

 * @dev: DRM device
@@ -914,6 +967,8 @@ int drm_connector_init(struct drm_device *dev, 
	connector->edid_blob_ptr = NULL;

	connector->status = connector_status_unknown;



	drm_connector_get_cmdline_mode(connector);



	list_add_tail(&connector->head, &dev->mode_config.connector_list);

	dev->mode_config.num_connector++;

drivers/gpu/drm/drm_fb_helper.c

+3 −61
Original line number Diff line number Diff line
@@ -171,60 +171,6 @@ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, 
}

EXPORT_SYMBOL(drm_fb_helper_remove_one_connector);



static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper)

{

	struct drm_fb_helper_connector *fb_helper_conn;

	int i;



	for (i = 0; i < fb_helper->connector_count; i++) {

		struct drm_cmdline_mode *mode;

		struct drm_connector *connector;

		char *option = NULL;



		fb_helper_conn = fb_helper->connector_info[i];

		connector = fb_helper_conn->connector;

		mode = &fb_helper_conn->cmdline_mode;



		/* do something on return - turn off connector maybe */

		if (fb_get_options(connector->name, &option))

			continue;



		if (drm_mode_parse_command_line_for_connector(option,

							      connector,

							      mode)) {

			if (mode->force) {

				const char *s;

				switch (mode->force) {

				case DRM_FORCE_OFF:

					s = "OFF";

					break;

				case DRM_FORCE_ON_DIGITAL:

					s = "ON - dig";

					break;

				default:

				case DRM_FORCE_ON:

					s = "ON";

					break;

				}



				DRM_INFO("forcing %s connector %s\n",

					 connector->name, s);

				connector->force = mode->force;

			}



			DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",

				      connector->name,

				      mode->xres, mode->yres,

				      mode->refresh_specified ? mode->refresh : 60,

				      mode->rb ? " reduced blanking" : "",

				      mode->margins ? " with margins" : "",

				      mode->interlace ?  " interlaced" : "");

		}



	}

	return 0;

}



static void drm_fb_helper_save_lut_atomic(struct drm_crtc *crtc, struct drm_fb_helper *helper)

{

	uint16_t *r_base, *g_base, *b_base;
@@ -1013,7 +959,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
		struct drm_fb_helper_connector *fb_helper_conn = fb_helper->connector_info[i];

		struct drm_cmdline_mode *cmdline_mode;



		cmdline_mode = &fb_helper_conn->cmdline_mode;

		cmdline_mode = &fb_helper_conn->connector->cmdline_mode;



		if (cmdline_mode->bpp_specified) {

			switch (cmdline_mode->bpp) {
@@ -1260,9 +1206,7 @@ EXPORT_SYMBOL(drm_has_preferred_mode); 


static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)

{

	struct drm_cmdline_mode *cmdline_mode;

	cmdline_mode = &fb_connector->cmdline_mode;

	return cmdline_mode->specified;

	return fb_connector->connector->cmdline_mode.specified;

}



struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,
@@ -1272,7 +1216,7 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f 
	struct drm_display_mode *mode = NULL;

	bool prefer_non_interlace;



	cmdline_mode = &fb_helper_conn->cmdline_mode;

	cmdline_mode = &fb_helper_conn->connector->cmdline_mode;

	if (cmdline_mode->specified == false)

		return mode;
@@ -1657,8 +1601,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;



	drm_fb_helper_parse_command_line(fb_helper);



	mutex_lock(&dev->mode_config.mutex);

	count = drm_fb_helper_probe_connector_modes(fb_helper,

						    dev->mode_config.max_width,

drivers/gpu/drm/drm_modes.c

+1 −0
Original line number Diff line number Diff line
@@ -1259,6 +1259,7 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, 
	if (!mode)

		return NULL;



	mode->type |= DRM_MODE_TYPE_USERDEF;

	drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);

	return mode;

}

drivers/gpu/drm/drm_probe_helper.c

+17 −0
Original line number Diff line number Diff line
@@ -82,6 +82,22 @@ static void drm_mode_validate_flag(struct drm_connector *connector, 
	return;

}



static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector)

{

	struct drm_display_mode *mode;



	if (!connector->cmdline_mode.specified)

		return 0;



	mode = drm_mode_create_from_cmdline_mode(connector->dev,

						 &connector->cmdline_mode);

	if (mode == NULL)

		return 0;



	drm_mode_probed_add(connector, mode);

	return 1;

}



static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connector *connector,

							      uint32_t maxX, uint32_t maxY, bool merge_type_bits)

{
@@ -141,6 +157,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect 


	if (count == 0 && connector->status == connector_status_connected)

		count = drm_add_modes_noedid(connector, 1024, 768);

	count += drm_helper_probe_add_cmdline_mode(connector);

	if (count == 0)

		goto prune;

CRA Git | Maintained and supported by SUSTech CRA and CCSE