Skip to content

Commit 9dd55df

Browse files
committed
drm/gma500: Never wait for blits
Blits cannot happen anymore since we removed the 2d accel code. Stop checking for a busy blitter and remove the remaining blitter code. Signed-off-by: Patrik Jakobsson <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 5c209d8 commit 9dd55df

File tree

4 files changed

+0
-71
lines changed

4 files changed

+0
-71
lines changed

drivers/gpu/drm/gma500/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
gma500_gfx-y += \
77
backlight.o \
8-
blitter.o \
98
cdv_device.o \
109
cdv_intel_crt.o \
1110
cdv_intel_display.o \

drivers/gpu/drm/gma500/blitter.c

Lines changed: 0 additions & 43 deletions
This file was deleted.

drivers/gpu/drm/gma500/blitter.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

drivers/gpu/drm/gma500/gtt.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include <asm/set_memory.h>
1313

14-
#include "blitter.h"
1514
#include "psb_drv.h"
1615

1716

@@ -229,18 +228,9 @@ void psb_gtt_unpin(struct gtt_range *gt)
229228
struct drm_device *dev = gt->gem.dev;
230229
struct drm_psb_private *dev_priv = dev->dev_private;
231230
u32 gpu_base = dev_priv->gtt.gatt_start;
232-
int ret;
233231

234-
/* While holding the gtt_mutex no new blits can be initiated */
235232
mutex_lock(&dev_priv->gtt_mutex);
236233

237-
/* Wait for any possible usage of the memory to be finished */
238-
ret = gma_blt_wait_idle(dev_priv);
239-
if (ret) {
240-
DRM_ERROR("Failed to idle the blitter, unpin failed!");
241-
goto out;
242-
}
243-
244234
WARN_ON(!gt->in_gart);
245235

246236
gt->in_gart--;
@@ -251,7 +241,6 @@ void psb_gtt_unpin(struct gtt_range *gt)
251241
psb_gtt_detach_pages(gt);
252242
}
253243

254-
out:
255244
mutex_unlock(&dev_priv->gtt_mutex);
256245
}
257246

0 commit comments

Comments
 (0)