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

 struct drm_device *main_device;
 struct drm_file   *drm_file_handlers[256];
 int vmw_init(void);
+int kms_init(struct drm_device *dev);
-int kms_init(struct drm_device *dev);
+void vmw_driver_thread();
-void kms_update();
 void kms_update();
 void cpu_detect();
-void parse_cmdline(char *cmdline, char *log);
-int _stdcall display_handler(ioctl_t *io);
-int srv_blit_bitmap(u32 hbitmap, int  dst_x, int dst_y,
-               int src_x, int src_y, u32 w, u32 h);
-int blit_textured(u32 hbitmap, int  dst_x, int dst_y,
-               int src_x, int src_y, u32 w, u32 h);
 void parse_cmdline(char *cmdline, char *log);
-int blit_tex(u32 hbitmap, int  dst_x, int dst_y,
+int _stdcall display_handler(ioctl_t *io);
              int src_x, int src_y, u32 w, u32 h);
 int x86_clflush_size;
 unsigned int tsc_khz;
-int kms_modeset = 1;
-void vmw_driver_thread()
-{
-    dbgprintf("%s\n",__FUNCTION__);
-//    run_workqueue(dev_priv->wq);
-    while(driver_wq_state)
-    {
-        kms_update();
-        delay(1);
-    };
-     __asm__ __volatile__ (
-     "int $0x40"
-     ::"a"(-1));
 int kms_modeset = 1;
 u32_t  __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
             *outp  = DISPLAY_VERSION;
             retval = 0;
             break;
         case SRV_ENUM_MODES:
-            dbgprintf("SRV_ENUM_MODES inp %x inp_size %x out_size %x\n",
+ //           dbgprintf("SRV_ENUM_MODES inp %x inp_size %x out_size %x\n",
-                       inp, io->inp_size, io->out_size );
+ //                      inp, io->inp_size, io->out_size );
-            check_output(4);
+ //           check_output(4);
 //            check_input(*outp * sizeof(videomode_t));
             if( kms_modeset)
                 retval = get_videomodes((videomode_t*)inp, outp);
             break;
         case SRV_SET_MODE:
-            dbgprintf("SRV_SET_MODE inp %x inp_size %x\n",
+//            dbgprintf("SRV_SET_MODE inp %x inp_size %x\n",
-                       inp, io->inp_size);
+//                       inp, io->inp_size);
-            check_input(sizeof(videomode_t));
+//            check_input(sizeof(videomode_t));
             if( kms_modeset )
                 retval = set_user_mode((videomode_t*)inp);
     uint32_t  *data;
     uint32_t   hot_x;
     uint32_t   hot_y;
+    struct list_head   list;
-    struct list_head   list;
+    void      *priv;
 }cursor_t;
     u32  mask_seqno;
     u32  check_mouse;
     u32  check_m_pixel;
 };
-static display_t *os_display;
+display_t *os_display;
 static int count_connector_modes(struct drm_connector* connector)
+{
+{
     struct drm_crtc *crtc = os_display->crtc;
     struct vmw_private *dev_priv = vmw_priv(crtc->dev);
     struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
+    du->cursor_x = x;
     du->cursor_y = y;
     vmw_cursor_update_position(dev_priv, true, x,y);
 };
 static cursor_t* __stdcall select_cursor_kms(cursor_t *cursor)
+{
     struct vmw_private *dev_priv = vmw_priv(os_display->ddev);
-    struct vmw_private *dev_priv = vmw_priv(os_display->ddev);
+    struct vmw_display_unit *du = vmw_crtc_to_du(os_display->crtc);
     cursor_t *old;
     old = os_display->cursor;
-    os_display->cursor = cursor;
+    os_display->cursor = cursor;
-    vmw_cursor_update_image(dev_priv, cursor->data,
-, 64, cursor->hot_x, cursor->hot_y);
-//    vmw_cursor_update_position(dev_priv, true,
+    vmw_cursor_update_image(dev_priv, cursor->data,
-//                   du->cursor_x + du->hotspot_x,
+, 64, cursor->hot_x, cursor->hot_y);
+    vmw_cursor_update_position(dev_priv, true,
+                   du->cursor_x, du->cursor_y);
+    return old;
+};
+void vmw_driver_thread()
+{
+    DRM_DEBUG_KMS("%s\n",__FUNCTION__);
+    select_cursor_kms(os_display->cursor);
+    while(driver_wq_state)
+    {
+        kms_update();
+        delay(2);
-//                   du->cursor_y + du->hotspot_y);
+    };
      __asm__ __volatile__ (
-    return old;
+     "int $0x40"
-};
      ::"a"(-1));
+}
-int kms_init(struct drm_device *dev)
-{
-    struct drm_connector    *connector;
+int kms_init(struct drm_device *dev)
     struct drm_connector_helper_funcs *connector_funcs;
-    struct drm_encoder      *encoder;
+    struct drm_connector    *connector;
-    struct drm_crtc         *crtc = NULL;
+    struct drm_encoder      *encoder;
-    struct drm_framebuffer  *fb;
-    cursor_t  *cursor;
+    struct drm_crtc         *crtc = NULL;
-    int        mode_count;
+    struct vmw_display_unit *du;
-    u32_t      ifl;
+    cursor_t  *cursor;
-    int        err;
+    int        mode_count;
         list_for_each_entry(mode, &connector->modes, head)
         mode_count++;
-    };
-    printf("%s %d\n",__FUNCTION__, mode_count);
+    };
     DRM_DEBUG_KMS("CONNECTOR %x ID:%d status:%d ENCODER %x CRTC %x ID:%d\n",
                connector, connector->base.id,
-               connector->status, connector->encoder,
-               crtc, crtc->base.id );
                connector->status, connector->encoder,
-    DRM_DEBUG_KMS("[Select CRTC:%d]\n", crtc->base.id);
-    os_display = GetDisplay();
+               crtc, crtc->base.id );
-    ifl = safe_cli();
+    os_display = GetDisplay();
+    os_display->ddev = dev;
+    os_display->connector = connector;
-        os_display->ddev = dev;
+    os_display->crtc = crtc;
-        os_display->connector = connector;
+    os_display->supported_modes = mode_count;
         os_display->crtc = crtc;
-        os_display->supported_modes = mode_count;
+    ifl = safe_cli();
+    {
         os_display->restore_cursor(0,0);
-        os_display->select_cursor  = select_cursor_kms;
-        os_display->show_cursor    = NULL;
+        os_display->select_cursor  = select_cursor_kms;
-        os_display->move_cursor    = move_cursor_kms;
+        os_display->show_cursor    = NULL;
-        os_display->restore_cursor = restore_cursor;
+        os_display->move_cursor    = move_cursor_kms;
-        os_display->disable_mouse  = disable_mouse;
+        os_display->restore_cursor = restore_cursor;
-        select_cursor_kms(os_display->cursor);
+        os_display->disable_mouse  = disable_mouse;
-    };
-    safe_sti(ifl);
+    };
     safe_sti(ifl);
 #ifdef __HWA__
-    err = init_bitmaps();
+    du = vmw_crtc_to_du(os_display->crtc);
-#endif
+    du->cursor_x = os_display->width/2;
     du->cursor_y = os_display->height/2;
-    LEAVE();
+    select_cursor_kms(os_display->cursor);
     return 0;
-    return 0;
+};
 };
+    }
     cmd->header = cpu_to_le32(SVGA_CMD_UPDATE);
     cmd->body.x = 0;
     cmd->body.y = 0;
-    cmd->body.width  = os_display->width; //cpu_to_le32(clips->x2 - clips->x1);
+    cmd->body.width  = os_display->width;
-    cmd->body.height = os_display->height; //cpu_to_le32(clips->y2 - clips->y1);
+    cmd->body.height = os_display->height;
     vmw_fifo_commit(dev_priv, fifo_size);
+}
 int get_videomodes(videomode_t *mode, int *count)
-int get_videomodes(videomode_t *mode, int *count)
-{
     int err = -1;
     struct drm_display_mode  *drmmode;
-    dbgprintf("mode %x count %d\n", mode, *count);
+    int err = -1;
     if( *count == 0 )
+    {
         *count = os_display->supported_modes;
-        err = 0;
         err = 0;
     else if( mode != NULL )
     else if( mode != NULL )
             if( i < *count)
+            {
                 mode->width  = drm_mode_width(drmmode);
                 mode->height = drm_mode_height(drmmode);
                 mode->bpp    = 32;
-                mode->freq   = drm_mode_vrefresh(drmmode);
+                mode->freq   = drmmode->vrefresh;
                 i++;
                 mode++;
+            }
             else break;
         };
         *count = i;
         err = 0;
     };
     return err;
 };

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/vmwgfx/main.c – Rev 4570 → 5078