|
@@ -349,8 +349,6 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
|
|
|
/* If we didn't get a handle then turn the cursor off */
|
|
|
if (!handle) {
|
|
|
temp = CURSOR_MODE_DISABLE;
|
|
|
- mutex_lock(&dev->struct_mutex);
|
|
|
-
|
|
|
if (gma_power_begin(dev, false)) {
|
|
|
REG_WRITE(control, temp);
|
|
|
REG_WRITE(base, 0);
|
|
@@ -362,11 +360,9 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
|
|
|
gt = container_of(gma_crtc->cursor_obj,
|
|
|
struct gtt_range, gem);
|
|
|
psb_gtt_unpin(gt);
|
|
|
- drm_gem_object_unreference(gma_crtc->cursor_obj);
|
|
|
+ drm_gem_object_unreference_unlocked(gma_crtc->cursor_obj);
|
|
|
gma_crtc->cursor_obj = NULL;
|
|
|
}
|
|
|
-
|
|
|
- mutex_unlock(&dev->struct_mutex);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -376,7 +372,6 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- mutex_lock(&dev->struct_mutex);
|
|
|
obj = drm_gem_object_lookup(dev, file_priv, handle);
|
|
|
if (!obj) {
|
|
|
ret = -ENOENT;
|
|
@@ -441,17 +436,15 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
|
|
|
if (gma_crtc->cursor_obj) {
|
|
|
gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);
|
|
|
psb_gtt_unpin(gt);
|
|
|
- drm_gem_object_unreference(gma_crtc->cursor_obj);
|
|
|
+ drm_gem_object_unreference_unlocked(gma_crtc->cursor_obj);
|
|
|
}
|
|
|
|
|
|
gma_crtc->cursor_obj = obj;
|
|
|
unlock:
|
|
|
- mutex_unlock(&dev->struct_mutex);
|
|
|
return ret;
|
|
|
|
|
|
unref_cursor:
|
|
|
- drm_gem_object_unreference(obj);
|
|
|
- mutex_unlock(&dev->struct_mutex);
|
|
|
+ drm_gem_object_unreference_unlocked(obj);
|
|
|
return ret;
|
|
|
}
|
|
|
|