[git,pull] drm fixes

Commit Message

Alex Riesen Feb. 25, 2011, 10:18 a.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cf4f74c..2e6b532 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1404,6 +1404,8 @@  i915_gem_get_unfenced_gtt_alignment(struct
drm_i915_gem_object *obj)
 	struct drm_device *dev = obj->base.dev;
 	int tile_height;

+	return i915_gem_get_gtt_alignment(obj);
+
 	/*
 	 * Minimum alignment is 4k (GTT page size) for sane hw.