WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/kms_display.c

         select_cursor_kms(os_display->cursor);
     };
     safe_sti(ifl);
 #define XY_COLOR_BLT        ((2<<29)|(0x50<<22)|(0x4))
 #define BLT_WRITE_ALPHA     (1<<21)
+#define BLT_WRITE_RGB       (1<<20)
+#if 1
 #define BLT_WRITE_RGB       (1<<20)
         drm_i915_private_t *dev_priv = dev->dev_private;
-        struct drm_i915_gem_object *obj;
-        struct intel_ring_buffer *ring;
-        u32_t br13, cmd, *b;
-        int      n=0;
-        cmd =  XY_COLOR_BLT | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
-        br13 = os_display->pitch;
-        br13 |= 0xF0 << 16;
+        struct drm_i915_gem_object *obj;
-        br13 |= 3 << 24;
+        struct intel_ring_buffer *ring;
         obj = i915_gem_alloc_object(dev, 4096);
+        i915_gem_object_pin(obj, 4096, true);
-        i915_gem_object_pin(obj, 4096, true);
-        cmd_buffer = MapIoMem(obj->pages[0], 4096, PG_SW|PG_NOCACHE);
-        cmd_offset = obj->gtt_offset;
-        b = (u32_t*)cmd_buffer;
-        b[n++] = cmd;
-        b[n++] = br13;
-        b[n++] = 0; // top, left
+        cmd_buffer = MapIoMem(obj->pages[0], 4096, PG_SW|PG_NOCACHE);
-        b[n++] = (128 << 16) | 128; // bottom, right
-        b[n++] = 0; // dst
-        b[n++] = 0x0000FF00;
-        b[n++] = MI_BATCH_BUFFER_END;
-        if( n & 1)
-            b[n++] = MI_NOOP;
-//        cmd_buffer = (u32_t)&b[n];
+        cmd_offset = obj->gtt_offset;
+    };
+#endif
-//        i915_gem_object_set_to_gtt_domain(obj, false);
+    int err;
     err = init_bitmaps();
         fb = fb_helper->fb;
         fb->width  = reqmode->width;
+        fb->height = reqmode->height;
-        fb->height = reqmode->height;
+        fb->pitches[0]  = ALIGN(reqmode->width * 4, 64);
+        fb->pitches[1]  = ALIGN(reqmode->width * 4, 64);
+        fb->pitches[2]  = ALIGN(reqmode->width * 4, 64);
+        fb->pitches[3]  = ALIGN(reqmode->width * 4, 64);
         fb->pitch  = ALIGN(reqmode->width * 4, 64);
         fb->bits_per_pixel = 32;
         fb->depth == 24;
         if (ret == true)
+        {
             os_display->width    = fb->width;
             os_display->height   = fb->height;
-            os_display->pitch    = fb->pitch;
+            os_display->pitch    = fb->pitches[0];
             os_display->vrefresh = drm_mode_vrefresh(mode);
-            sysSetScreen(fb->width, fb->height, fb->pitch);
+            sysSetScreen(fb->width, fb->height, fb->pitches[0]);
             dbgprintf("new mode %d x %d pitch %d\n",
-                       fb->width, fb->height, fb->pitch);
+                       fb->width, fb->height, fb->pitches[0]);
+        }
         else
             DRM_ERROR("failed to set mode %d_%d on crtc %p\n",
 };
 void __attribute__((regparm(1))) destroy_cursor(cursor_t *cursor)
+{
+/*  FIXME    synchronization */
     list_del(&cursor->list);
 //    radeon_bo_unpin(cursor->robj);
 //    KernelFree(cursor->data);
     __DestroyObject(cursor);
 };
 extern struct drm_device *main_device;
+#define XY_SRC_COPY_BLT_CMD     ((2<<29)|(0x53<<22)|6)
+typedef struct
+{
+    int left;
+    int top;
+    int right;
+    int bottom;
+}rect_t;
-#define XY_SRC_COPY_BLT_CMD     ((2<<29)|(0x53<<22)|6)
+#include "clip.inc"
+void  FASTCALL GetWindowRect(rect_t *rc)__asm__("GetWindowRect");
+#define CURRENT_TASK             (0x80003000)
 int video_blit(uint64_t src_offset, int  x, int y,
+static u32_t get_display_map()
+{
+    u32_t   addr;
+    addr = (u32_t)os_display;
+    addr+= sizeof(display_t);            /*  shoot me  */
+    return *(u32_t*)addr;
+}
+#define XY_SRC_COPY_CHROMA_CMD     ((2<<29)|(0x73<<22)|8)
+#define ROP_COPY_SRC               0xCC
+#define FORMAT8888                 3
+typedef int v4si __attribute__ ((vector_size (16)));
-                    int w, int h, int pitch)
+int blit_video(u32 hbitmap, int  dst_x, int dst_y,
                int src_x, int src_y, u32 w, u32 h)
+{
+    drm_i915_private_t *dev_priv = main_device->dev_private;
+    struct intel_ring_buffer *ring;
+    bitmap_t  *bitmap;
-    drm_i915_private_t *dev_priv = main_device->dev_private;
+    rect_t     winrc;
+    clip_t     dst_clip;
+    clip_t     src_clip;
+    u32_t      width;
-    struct intel_ring_buffer *ring;
+    u32_t      height;
-    u32_t br13, cmd, *b;
+    u32_t      br13, cmd, slot_mask, *b;
-    u32_t offset;
+    u32_t      offset;
+    u8         slot;
+    int      n=0;
-    int      n=0;
-//    if( cmd_buffer & 0xF80 )
-//        cmd_buffer&= 0xFFFFF000;
+    if(unlikely(hbitmap==0))
+        return -1;
+    bitmap = (bitmap_t*)hman_get_data(&bm_man, hbitmap);
+    if(unlikely(bitmap==NULL))
+        return -1;
+    GetWindowRect(&winrc);
-//    b = (u32_t*)ALIGN(cmd_buffer,16);
+    dst_clip.xmin   = 0;
+    dst_clip.ymin   = 0;
-//    offset = cmd_offset + ((u32_t)b & 0xFFF);
+    dst_clip.xmax   = winrc.right-winrc.left-1;
+    dst_clip.ymax   = winrc.bottom -winrc.top -1;
-    b = cmd_buffer;
+    src_clip.xmin   = 0;
-    cmd =  XY_SRC_COPY_BLT_CMD | BLT_WRITE_RGB;
+    src_clip.ymin   = 0;
-    br13 = os_display->pitch;
+    src_clip.xmax   = bitmap->width  - 1;
-    br13 |= 0xCC << 16;
+    src_clip.ymax   = bitmap->height - 1;
-    br13 |= 3 << 24;
-    b[n++] = cmd;
+    width  = w;
+    height = h;
-    b[n++] = br13;
-    b[n++] = (y << 16) | x;
+    if( blit_clip(&dst_clip, &dst_x, &dst_y,
-    b[n++] = ( (y+h) << 16) | (x+w); // bottom, right
-    b[n++] = 0; // dst_offset
+                  &src_clip, &src_x, &src_y,
-    b[n++] = 0; //src_top|src_left
+                  &width, &height) )
-    b[n++] = pitch;
-    b[n++] = (u32_t)src_offset;
+        return 0;
-    b[n++] = MI_BATCH_BUFFER_END;
-    if( n & 1)
-        b[n++] = MI_NOOP;
+    dst_x+= winrc.left;
+    dst_y+= winrc.top;
+    slot = *((u8*)CURRENT_TASK);
+    slot_mask = (u32_t)slot<<24;
+    {
+#if 0
+        static v4si write_mask = {0xFF000000, 0xFF000000,
+xFF000000, 0xFF000000};
+        u8* src_offset;
+        u8* dst_offset;
-//    i915_gem_object_set_to_gtt_domain(obj, false);
+        src_offset = (u8*)(src_y*bitmap->pitch + src_x*4);
+        src_offset += (u32)bitmap->uaddr;
+        dst_offset = (u8*)(dst_y*os_display->width + dst_x);
+        dst_offset+= get_display_map();
+        u32_t tmp_h = height;
+        __asm__ __volatile__ (
+        "movdqa     %[write_mask],  %%xmm7    \n"
+        "movd       %[slot_mask],   %%xmm6    \n"
+        "punpckldq  %%xmm6, %%xmm6            \n"
+        "punpcklqdq %%xmm6, %%xmm6            \n"
+        :: [write_mask] "m" (write_mask),
+           [slot_mask]  "g" (slot_mask)
+        :"xmm7", "xmm6");
+        while( tmp_h--)
+        {
+            u32_t tmp_w = width;
+            u8* tmp_src = src_offset;
+            u8* tmp_dst = dst_offset;
+            src_offset+= bitmap->pitch;
+            dst_offset+= os_display->width;
-    ring = &dev_priv->ring[BCS];
+            while( tmp_w >= 8 )
+            {
+                __asm__ __volatile__ (
+                "movq       (%0),   %%xmm0            \n"
+                "punpcklbw  %%xmm0, %%xmm0            \n"
+                "movdqa     %%xmm0, %%xmm1            \n"
+                "punpcklwd  %%xmm0, %%xmm0            \n"
+                "punpckhwd  %%xmm1, %%xmm1            \n"
+                "pcmpeqb    %%xmm6, %%xmm0            \n"
+                "pcmpeqb    %%xmm6, %%xmm1            \n"
+                "maskmovdqu %%xmm7, %%xmm0            \n"
+                "addl       $16, %%edi                \n"
+                "maskmovdqu %%xmm7, %%xmm1            \n"
+                :: "r" (tmp_dst), "D" (tmp_src)
+                :"xmm0", "xmm1");
-    ring->dispatch_execbuffer(ring, cmd_offset, n*4);
+                __asm__ __volatile__ ("":::"edi");
-    intel_ring_begin(ring, 4);
+                tmp_w -= 8;
-//    if (ret)
+                tmp_src += 32;
+                tmp_dst += 8;
+            };
+            if( tmp_w >= 4 )
+            {
+                __asm__ __volatile__ (
-//        return ret;
+                "movd       (%0),   %%xmm0            \n"
+                "punpcklbw  %%xmm0, %%xmm0            \n"
-//    cmd = MI_FLUSH_DW;
+                "punpcklwd  %%xmm0, %%xmm0            \n"
-//    if (invalidate & I915_GEM_GPU_DOMAINS)
+                "pcmpeqb    %%xmm6, %%xmm0            \n"
-//        cmd |= MI_INVALIDATE_TLB | MI_INVALIDATE_BSD;
+                "maskmovdqu %%xmm7, %%xmm0            \n"
-    intel_ring_emit(ring, MI_FLUSH_DW);
-    intel_ring_emit(ring, 0);
+                :: "r" (tmp_dst), "D" (tmp_src)
+                :"xmm0");
+                tmp_w -= 4;
-    intel_ring_emit(ring, 0);
+                tmp_src += 16;
-    intel_ring_emit(ring, MI_NOOP);
+                tmp_dst += 4;
-    intel_ring_advance(ring);
+            };
+            while( tmp_w--)
+            {
+                *(tmp_src+3) = (*tmp_dst==slot)?0xFF:0x00;
+                tmp_src+=4;
+                tmp_dst++;
+            };
+        };
+#else
+        u8* src_offset;
+        u8* dst_offset;
+        src_offset = (u8*)(src_y*bitmap->pitch + src_x*4);
+        src_offset += (u32)bitmap->uaddr;
-fail:
+        dst_offset = (u8*)(dst_y*os_display->width + dst_x);
-    return -1;
+        dst_offset+= get_display_map();
-};
+        u32_t tmp_h = height;
-int blit_video(u32 hbitmap, int  dst_x, int dst_y,
+        while( tmp_h--)
-               int src_x, int src_y, u32 w, u32 h)
+        {
             u32_t tmp_w = width;
     drm_i915_private_t *dev_priv = main_device->dev_private;
-    struct intel_ring_buffer *ring;
+            u8* tmp_src = src_offset;
+            u8* tmp_dst = dst_offset;
-    bitmap_t  *bitmap;
-    u32_t br13, cmd, *b;
+            src_offset+= bitmap->pitch;
+            dst_offset+= os_display->width;
-    u32_t offset;
+            while( tmp_w--)
+            {
-    int      n=0;
+                *(tmp_src+3) = (*tmp_dst==slot)?0xFF:0x00;
                 tmp_src+=4;
-    if(unlikely(hbitmap==0))
+                tmp_dst++;
-        return -1;
+            };
+        };
+    }
+#endif
+    if((cmd_buffer & 0xFC0)==0xFC0)
-    bitmap = hman_get_data(&bm_man, hbitmap);
+        cmd_buffer&= 0xFFFFF000;
-    if(unlikely(bitmap==NULL))
+    b = (u32_t*)ALIGN(cmd_buffer,16);
         return -1;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/kms_display.c – Rev 2340 → 2342