WebSVN – Kolibri OS – Diff – /drivers/video/drm/vmwgfx/vmwgfx_kms.c

 /**
  * Clip @num_rects number of @rects against @clip storing the
  * results in @out_rects and the number of passed rects in @out_num.
  */
-void vmw_clip_cliprects(struct drm_clip_rect *rects,
+static void vmw_clip_cliprects(struct drm_clip_rect *rects,
 			int num_rects,
 			struct vmw_clip_rect clip,
 			SVGASignedRect *out_rects,
 			int *out_num)
 	drm_crtc_cleanup(&du->crtc);
 	drm_encoder_cleanup(&du->encoder);
 	drm_connector_cleanup(&du->connector);
+}
 #if 0
 /*
  * Display Unit Cursor functions
  */
 		u32 cmd;
 		SVGAFifoCmdDefineAlphaCursor cursor;
 	} *cmd;
 	u32 image_size = width * height * 4;
 	u32 cmd_size = sizeof(*cmd) + image_size;
+    u32 *dst;
+    int i, j;
 	if (!image)
 		return -EINVAL;
 		return -ENOMEM;
+	}
+	memset(cmd, 0, sizeof(*cmd));
+    dst = (u32*)&cmd[1];
+    for(i = 0; i < 32; i++)
+    {
+        for(j = 0; j < 32; j++)
+            *dst++ = *image++;
+        for( ; j < 64; j++)
-	memset(cmd, 0, sizeof(*cmd));
+            *dst++ = 0;
+    }
     for(i = 0; i < 64*(64-32); i++)
-	memcpy(&cmd[1], image, image_size);
+        *image++ = 0;
 	cmd->cmd = cpu_to_le32(SVGA_CMD_DEFINE_ALPHA_CURSOR);
 	vmw_fifo_commit(dev_priv, cmd_size);
 	return 0;
+}
 #if 0
 int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv,
 			     struct vmw_dma_buffer *dmabuf,
 			     u32 width, u32 height,
 err_unreserve:
 	ttm_bo_unreserve(&dmabuf->base);
 	return ret;
 }
 #endif
 void vmw_cursor_update_position(struct vmw_private *dev_priv,
 				bool show, int x, int y)
 	iowrite32(y, fifo_mem + SVGA_FIFO_CURSOR_Y);
 	count = ioread32(fifo_mem + SVGA_FIFO_CURSOR_COUNT);
 	iowrite32(++count, fifo_mem + SVGA_FIFO_CURSOR_COUNT);
+}
 #if 0
 int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
 			   uint32_t handle, uint32_t width, uint32_t height)
+{
 	struct vmw_private *dev_priv = vmw_priv(crtc->dev);
 	struct vmw_dma_buffer *buffer;
 	struct list_head head;
 	struct drm_master *master;
 };
-void vmw_framebuffer_surface_destroy(struct drm_framebuffer *framebuffer)
+static void vmw_framebuffer_surface_destroy(struct drm_framebuffer *framebuffer)
+{
 	struct vmw_framebuffer_surface *vfbs =
 		vmw_framebuffer_to_vfbs(framebuffer);
-//   struct vmw_master *vmaster = vmw_master(vfbs->master);
+	struct vmw_master *vmaster = vmw_master(vfbs->master);
-//   mutex_lock(&vmaster->fb_surf_mutex);
-//   list_del(&vfbs->head);
-//   mutex_unlock(&vmaster->fb_surf_mutex);
-//   drm_master_put(&vfbs->master);
+	mutex_lock(&vmaster->fb_surf_mutex);
-//   drm_framebuffer_cleanup(framebuffer);
+	list_del(&vfbs->head);
-//   vmw_surface_unreference(&vfbs->surface);
+	mutex_unlock(&vmaster->fb_surf_mutex);
 	kfree(tmp);
 	return ret;
 }
-int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,
+static int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,
 				  struct drm_file *file_priv,
 				  unsigned flags, unsigned color,
 				  struct drm_clip_rect *clips,
 				  unsigned num_clips)
 {
 	struct vmw_private *dev_priv = vmw_priv(framebuffer->dev);
-//   struct vmw_master *vmaster = vmw_master(file_priv->master);
+	struct vmw_master *vmaster = vmw_master(file_priv->master);
 	struct vmw_framebuffer_surface *vfbs =
 		vmw_framebuffer_to_vfbs(framebuffer);
 	struct drm_clip_rect norect;
 	int ret, inc = 1;
-//   if (unlikely(vfbs->master != file_priv->master))
+	if (unlikely(vfbs->master != file_priv->master))
-//       return -EINVAL;
+		return -EINVAL;
+	/* Require ScreenObject support for 3D */
+	if (!dev_priv->sou_priv)
-	/* Require ScreenObject support for 3D */
+		return -EINVAL;
-	if (!dev_priv->sou_priv)
+	drm_modeset_lock_all(dev_priv->dev);
-		return -EINVAL;
+	ret = ttm_read_lock(&vmaster->lock, true);
 	if (unlikely(ret != 0)) {
-//   ret = ttm_read_lock(&vmaster->lock, true);
+		drm_modeset_unlock_all(dev_priv->dev);
-//   if (unlikely(ret != 0))
+		return ret;
 	ret = do_surface_dirty_sou(dev_priv, file_priv, &vfbs->base,
 				   flags, color,
 				   clips, num_clips, inc, NULL);
+	ttm_read_unlock(&vmaster->lock);
 	drm_modeset_unlock_all(dev_priv->dev);
 //   ttm_read_unlock(&vmaster->lock);
 	return 0;
+}
+{
 	struct drm_device *dev = dev_priv->dev;
 	struct vmw_framebuffer_surface *vfbs;
 	enum SVGA3dSurfaceFormat format;
-//   struct vmw_master *vmaster = vmw_master(file_priv->master);
+	struct vmw_master *vmaster = vmw_master(file_priv->master);
 	int ret;
 	/* 3D is only supported on HWv8 hosts which supports screen objects */
 	vfbs->base.base.height = mode_cmd->height;
 	vfbs->surface = surface;
 	vfbs->base.user_handle = mode_cmd->handle;
 //   vfbs->master = drm_master_get(file_priv->master);
-//   mutex_lock(&vmaster->fb_surf_mutex);
+	mutex_lock(&vmaster->fb_surf_mutex);
-//   list_add_tail(&vfbs->head, &vmaster->fb_surf);
+	list_add_tail(&vfbs->head, &vmaster->fb_surf);
-//   mutex_unlock(&vmaster->fb_surf_mutex);
+	mutex_unlock(&vmaster->fb_surf_mutex);
 	*out = &vfbs->base;
 struct vmw_framebuffer_dmabuf {
 	struct vmw_framebuffer base;
 	struct vmw_dma_buffer *buffer;
 };
-void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer)
+static void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer)
+{
 	struct vmw_framebuffer_dmabuf *vfbd =
 		vmw_framebuffer_to_vfbd(framebuffer);
 	kfree(blits);
 	return ret;
 }
-int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
+static int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
 				 struct drm_file *file_priv,
 				 unsigned flags, unsigned color,
 				 struct drm_clip_rect *clips,
 				 unsigned num_clips)
 {
 	struct vmw_private *dev_priv = vmw_priv(framebuffer->dev);
-//   struct vmw_master *vmaster = vmw_master(file_priv->master);
+	struct vmw_master *vmaster = vmw_master(file_priv->master);
 	struct vmw_framebuffer_dmabuf *vfbd =
 		vmw_framebuffer_to_vfbd(framebuffer);
+	struct drm_clip_rect norect;
+	int ret, increment = 1;
-	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)) {
-//   ret = ttm_read_lock(&vmaster->lock, true);
+		drm_modeset_unlock_all(dev_priv->dev);
-//   if (unlikely(ret != 0))
+		return ret;
 //       return ret;
 		ret = do_dmabuf_dirty_sou(file_priv, dev_priv, &vfbd->base,
 					  flags, color,
 					  clips, num_clips, increment, NULL);
+	}
+	ttm_read_unlock(&vmaster->lock);
+	drm_modeset_unlock_all(dev_priv->dev);
 //   ttm_read_unlock(&vmaster->lock);
 	return ret;
+}
 /*
  * Small shared kms functions.
  */
-int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
+static int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
 			 struct drm_vmw_rect *rects)
+{
 	struct drm_device *dev = dev_priv->dev;
+}
 #if 0
 int vmw_du_page_flip(struct drm_crtc *crtc,
 		     struct drm_framebuffer *fb,
+		     struct drm_pending_vblank_event *event,
-		     struct drm_pending_vblank_event *event)
+		     uint32_t page_flip_flags)
+{
 	struct vmw_private *dev_priv = vmw_priv(crtc->dev);
 	struct drm_framebuffer *old_fb = crtc->fb;
 	struct vmw_framebuffer *vfb = vmw_framebuffer_to_vfb(fb);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/vmwgfx/vmwgfx_kms.c – Rev 4569 → 4570