]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/fb-helper: Remove unused gamma_size variable
authorNoralf Trønnes <noralf@tronnes.org>
Tue, 26 Mar 2019 17:55:31 +0000 (18:55 +0100)
committerNoralf Trønnes <noralf@tronnes.org>
Wed, 3 Apr 2019 09:02:52 +0000 (11:02 +0200)
The gamma_size variable has not been used since
commit 4abe35204af8 ("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 d50ba256b5f1 ("drm/kms: start adding command line interface using fb.").

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326175546.18126-2-noralf@tronnes.org
drivers/gpu/drm/drm_fb_helper.c

index 03749a24e4dd294a80ea7f46d346aa9bed5937fa..a6d88f8b7a528837c7abee620d15e1891ecbd858 100644 (file)
@@ -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);