]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/i915: Make sure our labels start at column 0
authorDamien Lespiau <damien.lespiau@intel.com>
Thu, 4 Jun 2015 15:56:18 +0000 (16:56 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 12:32:49 +0000 (14:32 +0200)
I noticed one of those and it turned out we have a few lingering around.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sprite.c

index 193ba79e5a41f138e87c5a1398439a1912aa6ca5..9c07098d2e131a33651ad4edb682b43447ec3a2d 100644 (file)
@@ -7077,7 +7077,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)
 
        return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
 
- fail:
+fail:
        DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%04x\n", vco, tmp);
        return 200000;
 }
@@ -7118,7 +7118,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)
 
        return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
 
- fail:
+fail:
        DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%08x\n", vco, tmp);
        return 190476;
 }
index 8193a35388d7a0fbed6a947650f4a6bc8895c807..f5965fb49008365b839451f30564b20b07dda7aa 100644 (file)
@@ -1189,6 +1189,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
 
        drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
 
- out:
+out:
        return ret;
 }