summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2015-06-04 16:56:18 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-15 14:32:49 +0200
commitcaf4e2527599a86f1b7d6c7e13546d80e7e50a7c (patch)
treea4c7336d05bb79827709272e99ef46688a184b74
parentabd41dc93c37abc89fb0470a8195c58f37aa52ac (diff)
downloadop-kernel-dev-caf4e2527599a86f1b7d6c7e13546d80e7e50a7c.zip
op-kernel-dev-caf4e2527599a86f1b7d6c7e13546d80e7e50a7c.tar.gz
drm/i915: Make sure our labels start at column 0
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>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 193ba79..9c07098 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
}
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 8193a35..f5965fb 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -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;
}
OpenPOWER on IntegriCloud