WebSVN – Kolibri OS – Diff – /drivers/video/Intel-2D/sna.c

 #include
 static struct sna_fb sna_fb;
+static struct kgem_bo *mask_bo;
+static int mask_width, mask_height;
+static inline void delay(uint32_t time)
+{
+    __asm__ __volatile__(
+    "int $0x40"
+    ::"a"(5), "b"(time)
+    :"memory");
-static struct kgem_bo *mask_bo;
+};
 typedef struct __attribute__((packed))
+{
   unsigned      handle;
 //    pthread_mutex_init(&sna->render.lock, NULL);
 //    pthread_cond_init(&sna->render.wait, NULL);
     sna->render.active = 0;
+}
-bool sna_accel_init(struct sna *sna)
+int sna_accel_init(struct sna *sna)
+{
     const char *backend;
 		if (gen6_render_init(sna))
 			backend = "SandyBridge";
 	} else if (sna->info->gen >= 050) {
 		if (gen5_render_init(sna))
 			backend = "Ironlake";
-/*	} else if (sna->info->gen >= 040) {
+	} else if (sna->info->gen >= 040) {
 		if (gen4_render_init(sna))
 			backend = "Broadwater/Crestline";
-	} else if (sna->info->gen >= 030) {
+/*	} else if (sna->info->gen >= 030) {
 		if (gen3_render_init(sna))
-			backend = "gen3";
-	} else if (sna->info->gen >= 020) {
-		if (gen2_render_init(sna))
-			backend = "gen2"; */
+			backend = "gen3"; */
+	}
 	DBG(("%s(backend=%s, prefer_gpu=%x)\n",
     static struct pci_device device;
     struct sna *sna;
     DBG(("%s\n", __FUNCTION__));
-    sna = malloc(sizeof(struct sna));
+    sna = malloc(sizeof(*sna));
+    if (sna == NULL)
+        return 0;
     if (sna == NULL)
-        return false;
+    memset(sna, 0, sizeof(*sna));
     io.handle   = service;
     io.io_code  = SRV_GET_PCI_INFO;
     io.input    = &device;
     io.inp_size = sizeof(device);
+    io.output   = NULL;
+    io.out_size = 0;
-    io.output   = NULL;
+    if (call_service(&io)!=0)
-    io.out_size = 0;
+    {
         free(sna);
-    if (call_service(&io)!=0)
+        return 0;
-        return false;
+    };
+    sna->PciInfo = &device;
-    sna->PciInfo = &device;
+  	sna->info = intel_detect_chipset(sna->PciInfo);
-  	sna->info = intel_detect_chipset(sna->PciInfo);
+    kgem_init(&sna->kgem, service, sna->PciInfo, sna->info->gen);
     /* Default fail-safe value of 75 Hz */
 //    sna->vblank_interval = 1000 * 1000 * 1000 / 75;
     sna->flags = 0;
+    sna_accel_init(sna);
+    delay(10);
+    return sna->render.caps;
+}
+void sna_fini()
+{
+    if( sna_device )
+    {
+        sna_device->render.fini(sna_device);
+        kgem_bo_destroy(&sna_device->kgem, mask_bo);
+        kgem_close_batches(&sna_device->kgem);
    	    kgem_cleanup_cache(&sna_device->kgem);
-    return sna_accel_init(sna);
+    };
+}
     src.drawable.height = src_bitmap->height;
     dst.drawable.bitsPerPixel = 32;
     dst.drawable.width  = sna_fb.width;
     dst.drawable.height = sna_fb.height;
     memset(©, 0, sizeof(copy));
     src_bo = (struct kgem_bo*)src_bitmap->handle;
     if( sna_device->render.copy(sna_device, GXcopy,
                                 &src, src_bo,
                                 &dst, sna_fb.fb_bo, ©) )
+    {
         copy.blt(sna_device, ©, src_x, src_y, w, h, winx+dst_x, winy+dst_y);
-    copy.done(sna_device, ©);
+        copy.done(sna_device, ©);
+    }
     kgem_submit(&sna_device->kgem);
 //    __asm__ __volatile__("int3");
 };
 #endif
 int sna_create_bitmap(bitmap_t *bitmap)
+{
 	struct kgem_bo *bo;
     bo = kgem_create_2d(&sna_device->kgem, bitmap->width, bitmap->height,
 err_2:
     kgem_bo_destroy(&sna_device->kgem, bo);
 err_1:
+    return -1;
+};
+void sna_destroy_bitmap(bitmap_t *bitmap)
+{
+	struct kgem_bo *bo;
+    bo = (struct kgem_bo *)bitmap->handle;
-    return -1;
+    kgem_bo_destroy(&sna_device->kgem, bo);
 };
 };
 int sna_create_mask()
+{
-	struct kgem_bo *bo;
-    char proc_info[1024];
+	struct kgem_bo *bo;
     int width, height;
-    int i;
-    get_proc_info(proc_info);
+    int i;
-    width  = *(uint32_t*)(proc_info+42)+1;
-    height = *(uint32_t*)(proc_info+46)+1;
-    printf("%s width %d height %d\n", __FUNCTION__, width, height);
+    printf("%s width %d height %d\n", __FUNCTION__, sna_fb.width, sna_fb.height);
-    bo = kgem_create_2d(&sna_device->kgem, width, height,
+    bo = kgem_create_2d(&sna_device->kgem, sna_fb.width, sna_fb.height,
     if(map == NULL)
         goto err_2;
     memset(map, 0, bo->pitch * height);
+    mask_bo     = bo;
+    mask_width  = width;
-    mask_bo = bo;
+    mask_height = height;
     return 0;
     return -1;
 };
 bool
 gen6_composite(struct sna *sna,
               uint8_t op,
 		      PixmapPtr src, struct kgem_bo *src_bo,
 		      PixmapPtr mask,struct kgem_bo *mask_bo,
 		      PixmapPtr dst, struct kgem_bo *dst_bo,
               int32_t src_x, int32_t src_y,
               int32_t msk_x, int32_t msk_y,
               int32_t dst_x, int32_t dst_y,
               int32_t width, int32_t height,
     winx = *(uint32_t*)(proc_info+34);
     winy = *(uint32_t*)(proc_info+38);
     winw = *(uint32_t*)(proc_info+42)+1;
     winh = *(uint32_t*)(proc_info+46)+1;
+    VG_CLEAR(update);
+	update.handle = mask_bo->handle;
+//	update.bo_size   = __kgem_bo_size(mask_bo);
+//	update.bo_pitch  = mask_bo->pitch;
+	update.bo_map    = (__u32)MAP(mask_bo->map);
+	drmIoctl(sna_device->kgem.fd, SRV_MASK_UPDATE, &update);
+    mask_bo->pitch = update.bo_pitch;
     memset(&src, 0, sizeof(src));
     memset(&dst, 0, sizeof(dst));
     memset(&mask, 0, sizeof(dst));
     dst.drawable.bitsPerPixel = 32;
     dst.drawable.width  = sna_fb.width;
     dst.drawable.height = sna_fb.height;
     mask.drawable.bitsPerPixel = 8;
-    mask.drawable.width  = winw;
+    mask.drawable.width  = update.width;
-    mask.drawable.height = winh;
+    mask.drawable.height = update.height;
     memset(&composite, 0, sizeof(composite));
     src_bo = (struct kgem_bo*)src_bitmap->handle;
     if( sna_device->render.blit_tex(sna_device, PictOpSrc,
 		      &src, src_bo,
 		      &mask, mask_bo,
 		      &dst, sna_fb.fb_bo,
-                                 src_x, src_y,
+              src_x, src_y,
-                                 dst_x, dst_y,
+              dst_x, dst_y,
               winx+dst_x, winy+dst_y,
               w, h,
               &composite) )
+    {
 	    struct sna_composite_rectangles r;
 	    r.src.x = src_x;
 	    r.src.y = src_y;
 	    r.mask.x = dst_x;
 	    r.mask.y = dst_y;
 		r.dst.x = winx+dst_x;
-	    r.dst.y = winy+dst_y;
-	    r.width  = w;
-	    r.height = h;
-        composite.blt(sna_device, &composite, &r);
-        composite.done(sna_device, &composite);
-    };
 	    r.dst.y = winy+dst_y;
-    VG_CLEAR(update);
+	    r.width  = w;
-	update.handle = mask_bo->handle;
+	    r.height = h;

Subversion Repositories Kolibri OS

(root)/drivers/video/Intel-2D/sna.c – Rev 3280 → 3291