diff --git a/[refs] b/[refs] index 7c4c6a105ba8..71ce2933882e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e61615857c6fb3afbcb43f5c4e97511a923f5a8 +refs/heads/master: 6f465a8925016633891f5bf030f9c37036529b39 diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index 5a6b731c5529..7a73b2941eb7 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -1125,7 +1125,7 @@ static void i915_setup_compression(struct drm_device *dev, int size) return; } - compressed_llb = drm_mm_get_block(compressed_fb, 4096, 4096); + compressed_llb = drm_mm_get_block(compressed_llb, 4096, 4096); if (!compressed_llb) { i915_warn_stolen(dev); return;