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

         stride = ALIGN(stride, 64);
         size = stride * ALIGN(mode->vdisplay, 2);
+    }
-    dbgprintf("size %x stride %x\n", size, stride);
+    DRM_DEBUG_KMS("size %x stride %x\n", size, stride);
     if(intel_fb == NULL || size > intel_fb->obj->base.size)
+    {
         struct drm_mode_fb_cmd2 mode_cmd = {};
         obj->fence_dirty = true;
         obj->stride      = stride;
     };
+    if (obj->base.name == 0)
+    {
+        int ret;
+        mutex_lock(&dev->object_name_lock);
+        idr_preload(GFP_KERNEL);
+        ret = idr_alloc(&dev->object_name_idr, &obj->base, 1, 0, GFP_NOWAIT);
+        idr_preload_end();
+        mutex_unlock(&dev->object_name_lock);
+        obj->base.name = ret;
+        obj->base.handle_count++;
+        DRM_DEBUG_KMS("%s allocate fb name %d\n", __FUNCTION__, obj->base.name );
+    }
     fb->width  = mode->hdisplay;
     fb->height = mode->vdisplay;
     fb->pitches[0]  =
 static int set_mode(struct drm_device *dev, struct drm_connector *connector,
                     struct drm_crtc *crtc, videomode_t *reqmode, bool strict)
+{
-    struct drm_i915_private *dev_priv   = dev->dev_private;
+    struct drm_i915_private *dev_priv = dev->dev_private;
-    struct drm_mode_config  *config     = &dev->mode_config;
+    struct drm_mode_config  *config   = &dev->mode_config;
-    struct drm_display_mode *mode       = NULL, *tmpmode;
+    struct drm_display_mode *mode     = NULL, *tmpmode;
     struct drm_connector    *tmpc;
-    struct drm_framebuffer  *fb         = NULL;
+    struct drm_framebuffer  *fb       = NULL;
     struct drm_mode_set     set;
     char  con_edid[128];
     int ret;
     DRM_DEBUG_KMS("set mode %dx%d: crtc %d connector %s\n"
                   "monitor: %s model %x serial number %u\n",
                 mode->hdisplay, mode->vdisplay,
                 crtc->base.id, connector->name,
-            manufacturer_name(con_edid + 0x08),
+                manufacturer_name(con_edid + 0x08),
-            (unsigned short)(con_edid[0x0A] + (con_edid[0x0B] << 8)),
+                (unsigned short)(con_edid[0x0A] + (con_edid[0x0B] << 8)),
-            (unsigned int)(con_edid[0x0C] + (con_edid[0x0D] << 8)
+                (unsigned int)(con_edid[0x0C] + (con_edid[0x0D] << 8)
-            + (con_edid[0x0E] << 16) + (con_edid[0x0F] << 24)));
+                + (con_edid[0x0E] << 16) + (con_edid[0x0F] << 24)));
     drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
     struct drm_connector    *connector = NULL;
     struct drm_crtc         *crtc = NULL;
     struct drm_plane *plane;
-    int       ret;
+    int ret;
 ENTER();
     drm_for_each_plane(plane, dev)
+    {
         DRM_DEBUG_KMS("No active connectors!\n");
         return -1;
     };
-/*
-    mutex_lock(&dev->object_name_lock);
-    idr_preload(GFP_KERNEL);
-    if (!main_fb_obj->base.name) {
-        ret = idr_alloc(&dev->object_name_idr, &main_fb_obj->base, 1, 0, GFP_NOWAIT);
-        main_fb_obj->base.name = ret;
-        main_fb_obj->base.handle_count++;
-        DRM_DEBUG_KMS("%s allocate fb name %d\n", __FUNCTION__, main_fb_obj->base.name );
-    }
-    idr_preload_end();
-    mutex_unlock(&dev->object_name_lock);
-*/
     dummy_fb_page = AllocPage();
     os_display = GetDisplay();
     os_display->ddev = dev;
         fb->crtc   = crtc->base.base.id;
         fb->pipe   = crtc->pipe;
+    }
     safe_sti(ifl);
     return 0;
+    return 0;
+}
 int kolibri_framebuffer_init(struct intel_framebuffer *intel_fb)
+{
     struct kos_framebuffer *kfb;
     addr_t dummy_table;
     addr_t *pt_addr = NULL;
     int pde;
-ENTER();
     kfb = kzalloc(sizeof(struct kos_framebuffer),0);
     kfb->private = intel_fb;
     for(pde = 0; pde < 8; pde++)
         kunmap((struct page*)dummy_table);
     };
     intel_fb->private = kfb;
-LEAVE();
     return 0;
 #if 0
     struct sg_page_iter sg_iter;
     num_pages = obj->base.size/4096;
     printf("num_pages %d\n",num_pages);
     __sg_page_iter_start(&sg_iter, obj->pages->sgl, sg_nents(obj->pages->sgl), 0);
     while (__sg_page_iter_next(&sg_iter))
+    {
         if (pt_addr == NULL)
-    {
+        {
             addr_t pt = AllocPage();
             kfb->pde[pde] = pt|PG_UW;
             pde++;
             pt_addr = kmap_atomic((struct page*)pt);
-    }
+        }
         pt_addr[pte] = sg_page_iter_dma_address(&sg_iter)|PG_UW|PG_WRITEC;
         if( (pte & 15) == 0)
             DRM_DEBUG_KMS("pte %x\n",pt_addr[pte]);
         if (++pte == 1024)
-    {
+        {
             kunmap_atomic(pt_addr);
             pt_addr = NULL;
             if (pde == 8)
                 break;
             pte = 0;
+        }
-        }
+    }
     if(pt_addr)
+    {
         for(;pte < 1024; pte++)
             pt_addr[pte] = dummy_page|PG_UW;
         kunmap_atomic(pt_addr);
+    }
 #endif
 };
     num_pages = intel_fb->obj->base.size/4096;
     pfn = dev_priv->gtt.mappable_base + i915_gem_obj_ggtt_offset(intel_fb->obj);
     while(num_pages)
-        {
+    {
         if (pt_addr == NULL)
+        {
             addr_t pt = kfb->pde[pde] & 0xFFFFF000;
             pde++;
             pt_addr = kmap_atomic((struct page*)pt);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/kms_display.c – Rev 6283 → 6296