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

drm/fb-helper: Remove unused gamma_size variable 



The gamma_size variable has not been used since
commit 4abe3520 ("drm/kms/fb: use slow work mechanism for normal hotplug also.")

While in the area move a comment back to its code block.
They got separated by
commit d50ba256 ("drm/kms: start adding command line interface using fb.").

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326175546.18126-2-noralf@tronnes.org
parent a7190042

drivers/gpu/drm/drm_fb_helper.c

+1 −5
Original line number Diff line number Diff line
@@ -1874,7 +1874,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
	int crtc_count = 0;

	int i;

	struct drm_fb_helper_surface_size sizes;

	int gamma_size = 0;

	int best_depth = 0;



	memset(&sizes, 0, sizeof(struct drm_fb_helper_surface_size));
@@ -1890,7 +1889,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
	if (preferred_bpp != sizes.surface_bpp)

		sizes.surface_depth = sizes.surface_bpp = preferred_bpp;



	/* first up get a count of crtcs now in use and new min/maxes width/heights */

	drm_fb_helper_for_each_connector(fb_helper, i) {

		struct drm_fb_helper_connector *fb_helper_conn = fb_helper->connector_info[i];

		struct drm_cmdline_mode *cmdline_mode;
@@ -1970,6 +1968,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
		sizes.surface_depth = best_depth;

	}



	/* first up get a count of crtcs now in use and new min/maxes width/heights */

	crtc_count = 0;

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

		struct drm_display_mode *desired_mode;
@@ -1992,9 +1991,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
		x = fb_helper->crtc_info[i].x;

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



		if (gamma_size == 0)

			gamma_size = fb_helper->crtc_info[i].mode_set.crtc->gamma_size;



		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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE