WebSVN – Kolibri OS – Path Comparison – / – /drivers/ Rev 3299 and /drivers/ Rev 3298

Regard whitespace Rev 3299 → Rev 3298

/drivers/video/Intel-2D/gen3_render.c
File deleted

/drivers/video/Intel-2D/gen3_render.h
File deleted

 /drivers/video/Intel-2D/kgem-sna.c
 ,6 → 44,7
 }
 unsigned int cpu_cache_size();
 static struct kgem_bo *
 ,8 → 794,8
 static bool kgem_init_pinned_batches(struct kgem *kgem)
 {
-        int count[2] = { 2, 1 };
-        int size[2] = { 1, 2 };
+        int count[2] = { 4, 2 };
+        int size[2] = { 1, 4 };
         int n, i;
         if (kgem->wedged)
 ,6 → 1339,7
 static void kgem_bo_free(struct kgem *kgem, struct kgem_bo *bo)
 {
         DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
+        printf("%s: handle=%d\n", __FUNCTION__, bo->handle);
         assert(bo->refcnt == 0);
         assert(bo->exec == NULL);
 ,6 → 1601,8
 {
         DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
+        printf("%s: handle=%d\n", __FUNCTION__, bo->handle);
         assert(list_is_empty(&bo->list));
         assert(bo->refcnt == 0);
         assert(!bo->purged);
 ,8 → 4208,8
     bo->scanout   = 1;
         fb->fb_bo     = bo;
-//    printf("fb width %d height %d pitch %d bo %p\n",
-//            fb->width, fb->height, fb->pitch, fb->fb_bo);
+    printf("fb width %d height %d pitch %d bo %p\n",
+            fb->width, fb->height, fb->pitch, fb->fb_bo);
     return 1;
 };

 /drivers/video/Intel-2D/kgem.h
 ,7 → 28,7
 #ifndef KGEM_H
 #define KGEM_H
-#define HAS_DEBUG_FULL 0
+#define HAS_DEBUG_FULL 1
 #include <stdint.h>
 #include <stdbool.h>
 ,13 → 40,6
 #include "compiler.h"
 #include "intel_list.h"
-static inline void delay(uint32_t time)
-{
-    __asm__ __volatile__(
-    "int $0x40"
-    ::"a"(5), "b"(time)
-    :"memory");
-};
 #if HAS_DEBUG_FULL

 /drivers/video/Intel-2D/sna.c
 ,6 → 12,14
 static int mask_width, mask_height;
+static inline void delay(uint32_t time)
+{
+    __asm__ __volatile__(
+    "int $0x40"
+    ::"a"(5), "b"(time)
+    :"memory");
+};
 typedef struct __attribute__((packed))
 {
   unsigned      handle;
 ,9 → 135,9
         } 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";
+                        backend = "gen3"; */
         }
         DBG(("%s(backend=%s, prefer_gpu=%x)\n",
 ,6 → 188,7
     kgem_init(&sna->kgem, service, sna->PciInfo, sna->info->gen);
+    delay(10);
 /*
     if (!xf86ReturnOptValBool(sna->Options,
                   OPTION_RELAXED_FENCING,
 ,7 → 466,7
     int width, height;
     int i;
-//    printf("%s width %d height %d\n", __FUNCTION__, sna_fb.width, sna_fb.height);
+    printf("%s width %d height %d\n", __FUNCTION__, sna_fb.width, sna_fb.height);
     bo = kgem_create_2d(&sna_device->kgem, sna_fb.width, sna_fb.height,
 ,I915_TILING_NONE, CREATE_CPU_MAP);

/drivers/video/Intel-2D/sna.h
135,7 → 135,6
} PictFormatShort;

#define PIXMAN_FORMAT_A(f) (((f) >> 12) & 0x0f)
#define PIXMAN_FORMAT_RGB(f) (((f) ) & 0xfff)

#define PICT_FORMAT_A(f) PIXMAN_FORMAT_A(f)