Commit 73e9efd4 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: Push dirtyfb ioctl kms locking down to drivers 



Not all drivers will need take all the modeset locks for dirtyfb, so
push the locking down to the drivers.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ee61c730

drivers/gpu/drm/drm_crtc.c

+0 −2
Original line number Diff line number Diff line
@@ -2767,10 +2767,8 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 
	}



	if (fb->funcs->dirty) {

		drm_modeset_lock_all(dev);

		ret = fb->funcs->dirty(fb, file_priv, flags, r->color,

				       clips, num_clips);

		drm_modeset_unlock_all(dev);

	} else {

		ret = -ENOSYS;

	}

drivers/gpu/drm/omapdrm/omap_fb.c

+4 −0
Original line number Diff line number Diff line
@@ -123,12 +123,16 @@ static int omap_framebuffer_dirty(struct drm_framebuffer *fb, 
{

	int i;



	drm_modeset_lock_all(fb->dev);



	for (i = 0; i < num_clips; i++) {

		omap_framebuffer_flush(fb, clips[i].x1, clips[i].y1,

					clips[i].x2 - clips[i].x1,

					clips[i].y2 - clips[i].y1);

	}



	drm_modeset_unlock_all(fb->dev);



	return 0;

}

drivers/gpu/drm/qxl/qxl_display.c

+8 −1
Original line number Diff line number Diff line
@@ -399,10 +399,14 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, 
	struct qxl_bo *qobj;

	int inc = 1;



	drm_modeset_lock_all(fb->dev);



	qobj = gem_to_qxl_bo(qxl_fb->obj);

	/* if we aren't primary surface ignore this */

	if (!qobj->is_primary)

	if (!qobj->is_primary) {

		drm_modeset_unlock_all(fb->dev);

		return 0;

	}



	if (!num_clips) {

		num_clips = 1;
@@ -417,6 +421,9 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, 


	qxl_draw_dirty_fb(qdev, qxl_fb, qobj, flags, color,

			  clips, num_clips, inc);



	drm_modeset_unlock_all(fb->dev);



	return 0;

}

drivers/gpu/drm/udl/udl_fb.c

+9 −3
Original line number Diff line number Diff line
@@ -403,15 +403,17 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, 
	int i;

	int ret = 0;



	drm_modeset_lock_all(fb->dev);



	if (!ufb->active_16)

		return 0;

		goto unlock;



	if (ufb->obj->base.import_attach) {

		ret = dma_buf_begin_cpu_access(ufb->obj->base.import_attach->dmabuf,

					       0, ufb->obj->base.size,

					       DMA_FROM_DEVICE);

		if (ret)

			return ret;

			goto unlock;

	}



	for (i = 0; i < num_clips; i++) {
@@ -419,7 +421,7 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, 
				  clips[i].x2 - clips[i].x1,

				  clips[i].y2 - clips[i].y1);

		if (ret)

			break;

			goto unlock;

	}



	if (ufb->obj->base.import_attach) {
@@ -427,6 +429,10 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, 
				       0, ufb->obj->base.size,

				       DMA_FROM_DEVICE);

	}



 unlock:

	drm_modeset_unlock_all(fb->dev);



	return ret;

}

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+16 −2
Original line number Diff line number Diff line
@@ -609,9 +609,13 @@ int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, 
	if (!dev_priv->sou_priv)

		return -EINVAL;



	drm_modeset_lock_all(dev_priv->dev);



	ret = ttm_read_lock(&vmaster->lock, true);

	if (unlikely(ret != 0))

	if (unlikely(ret != 0)) {

		drm_modeset_unlock_all(dev_priv->dev);

		return ret;

	}



	if (!num_clips) {

		num_clips = 1;
@@ -629,6 +633,9 @@ int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, 
				   clips, num_clips, inc, NULL);



	ttm_read_unlock(&vmaster->lock);



	drm_modeset_unlock_all(dev_priv->dev);



	return 0;

}
@@ -953,9 +960,13 @@ int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, 
	struct drm_clip_rect norect;

	int ret, increment = 1;



	drm_modeset_lock_all(dev_priv->dev);



	ret = ttm_read_lock(&vmaster->lock, true);

	if (unlikely(ret != 0))

	if (unlikely(ret != 0)) {

		drm_modeset_unlock_all(dev_priv->dev);

		return ret;

	}



	if (!num_clips) {

		num_clips = 1;
@@ -979,6 +990,9 @@ int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, 
	}



	ttm_read_unlock(&vmaster->lock);



	drm_modeset_unlock_all(dev_priv->dev);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE