Explorar o código

drm/ast: do not attempt to acquire a reservation while in an interrupt handler

Mutexes should not be acquired in interrupt context. While the trylock
fastpath is arguably safe on all implementations, the slowpath
unlock path definitely isn't.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Maarten Lankhorst %!s(int64=12) %!d(string=hai) anos
pai
achega
8ade2b8281
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      drivers/gpu/drm/ast/ast_fb.c

+ 3 - 2
drivers/gpu/drm/ast/ast_fb.c

@@ -51,7 +51,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
 	struct ast_bo *bo;
 	struct ast_bo *bo;
 	int src_offset, dst_offset;
 	int src_offset, dst_offset;
 	int bpp = (afbdev->afb.base.bits_per_pixel + 7)/8;
 	int bpp = (afbdev->afb.base.bits_per_pixel + 7)/8;
-	int ret;
+	int ret = -EBUSY;
 	bool unmap = false;
 	bool unmap = false;
 	bool store_for_later = false;
 	bool store_for_later = false;
 	int x2, y2;
 	int x2, y2;
@@ -65,7 +65,8 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
 	 * then the BO is being moved and we should
 	 * then the BO is being moved and we should
 	 * store up the damage until later.
 	 * store up the damage until later.
 	 */
 	 */
-	ret = ast_bo_reserve(bo, true);
+	if (!in_interrupt())
+		ret = ast_bo_reserve(bo, true);
 	if (ret) {
 	if (ret) {
 		if (ret != -EBUSY)
 		if (ret != -EBUSY)
 			return;
 			return;