Commit c8de0d5f authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/fb-helper: Remove drm_fb_helper_crtc->{x, y, desired_mode} 



The values are already present in the modeset.

This is done in preparation for the removal of struct drm_fb_helper_crtc.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190506180139.6913-5-noralf@tronnes.org
parent bc934755

drivers/gpu/drm/drm_fb_helper.c

+4 −8
Original line number Diff line number Diff line
@@ -2031,16 +2031,16 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
		 */

		bool lastv = true, lasth = true;



		desired_mode = fb_helper->crtc_info[i].desired_mode;

		mode_set = &fb_helper->crtc_info[i].mode_set;

		desired_mode = mode_set->mode;



		if (!desired_mode)

			continue;



		crtc_count++;



		x = fb_helper->crtc_info[i].x;

		y = fb_helper->crtc_info[i].y;

		x = mode_set->x;

		y = mode_set->y;



		sizes.surface_width  = max_t(u32, desired_mode->hdisplay + x, sizes.surface_width);

		sizes.surface_height = max_t(u32, desired_mode->vdisplay + y, sizes.surface_height);
@@ -2814,11 +2814,7 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, 
			DRM_DEBUG_KMS("desired mode %s set on crtc %d (%d,%d)\n",

				      mode->name, fb_crtc->mode_set.crtc->base.id, offset->x, offset->y);



			fb_crtc->desired_mode = mode;

			fb_crtc->x = offset->x;

			fb_crtc->y = offset->y;

			modeset->mode = drm_mode_duplicate(dev,

							   fb_crtc->desired_mode);

			modeset->mode = drm_mode_duplicate(dev, mode);

			drm_connector_get(connector);

			modeset->connectors[modeset->num_connectors++] = connector;

			modeset->x = offset->x;

include/drm/drm_fb_helper.h

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ struct drm_fb_offset { 


struct drm_fb_helper_crtc {

	struct drm_mode_set mode_set;

	struct drm_display_mode *desired_mode;

	int x, y;

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE