Merge "drm/modes: Support modes names on the command line" (0d5924b0) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/drm_client_modeset.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -148,6 +148,10 @@ drm_connector_pick_cmdline_mode(struct drm_connector *connector)
		prefer_non_interlace = !cmdline_mode->interlace;
		again:
		list_for_each_entry(mode, &connector->modes, head) {
		/* Check (optional) mode name first */
		if (!strcmp(mode->name, cmdline_mode->name))
		return mode;

		/* check width/height */
		if (mode->hdisplay != cmdline_mode->xres \|\|
		mode->vdisplay != cmdline_mode->yres)
		@@ -803,7 +807,6 @@ EXPORT_SYMBOL(drm_client_modeset_probe);
		static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active)
		{
		struct drm_device *dev = client->dev;
		struct drm_plane_state *plane_state;
		struct drm_plane *plane;
		struct drm_atomic_state *state;
		struct drm_modeset_acquire_ctx ctx;
		@@ -821,6 +824,8 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool
		state->acquire_ctx = &ctx;
		retry:
		drm_for_each_plane(plane, dev) {
		struct drm_plane_state *plane_state;

		plane_state = drm_atomic_get_plane_state(state, plane);
		if (IS_ERR(plane_state)) {
		ret = PTR_ERR(plane_state);

+2 −1

Original line number	Diff line number	Diff line
		@@ -147,8 +147,9 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
		connector->force = mode->force;
		}

		DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",
		DRM_DEBUG_KMS("cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n",
		connector->name,
		mode->name,
		mode->xres, mode->yres,
		mode->refresh_specified ? mode->refresh : 60,
		mode->rb ? " reduced blanking" : "",

+6 −0

Original line number	Diff line number	Diff line
		@@ -497,6 +497,12 @@ struct drm_connector_funcs {

		/* mode specified on the command line */
		struct drm_cmdline_mode {
		/**
		* @name:
		*
		* Name of the mode.
		*/
		char name[DRM_DISPLAY_MODE_LEN];
		bool specified;
		bool refresh_specified;
		bool bpp_specified;