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

     struct drm_crtc         *crtc;
     struct drm_encoder      *encoder;
     struct drm_i915_gem_object *fb_obj;
     struct drm_mode_set     set;
-    char *con_name;
+    const char *con_name;
-    char *enc_name;
+    const char *enc_name;
     unsigned hdisplay, vdisplay;
     int ret;
     mutex_lock(&dev->mode_config.mutex);
     return def_connector;
 };
-int init_display_kms(struct drm_device *dev, videomode_t *usermode)
+struct drm_connector *get_active_connector(struct drm_device *dev)
 {
-    struct drm_connector    *connector;
+    struct drm_connector *tmp = NULL;
     struct drm_connector_helper_funcs *connector_funcs;
-    struct drm_encoder      *encoder;
-    struct drm_crtc         *crtc = NULL;
-    struct drm_framebuffer  *fb;
-    cursor_t  *cursor;
-    u32_t      ifl;
-    int        err;
-    ENTER();
-    mutex_lock(&dev->mode_config.mutex);
+    struct drm_encoder      *encoder;
-    list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+    list_for_each_entry(tmp, &dev->mode_config.connector_list, head)
+    {
-        if( connector->status != connector_status_connected)
+        if( tmp->status != connector_status_connected)
             continue;
-        connector_funcs = connector->helper_private;
+        connector_funcs = tmp->helper_private;
-        encoder = connector_funcs->best_encoder(connector);
+        encoder = connector_funcs->best_encoder(tmp);
         if( encoder == NULL)
+        {
             DRM_DEBUG_KMS("CONNECTOR %x ID: %d no active encoders\n",
+                      tmp, tmp->base.id);
-                      connector, connector->base.id);
+            continue;
-            continue;
         };
-        connector->encoder = encoder;
-        crtc = encoder->crtc;
+        tmp->encoder = encoder;
-        DRM_DEBUG_KMS("CONNECTOR %p ID:%d status:%d ENCODER %x CRTC %p ID:%d\n",
-               connector, connector->base.id,
-               connector->status, connector->encoder,
-               crtc, crtc->base.id );
-        break;
-    };
-    if(connector == NULL)
+        DRM_DEBUG_KMS("CONNECTOR %p ID:%d status:%d ENCODER %x CRTC %p ID:%d\n",
-    {
+               tmp, tmp->base.id, tmp->status, tmp->encoder,
+               tmp->encoder->crtc, tmp->encoder->crtc->base.id );
-        DRM_DEBUG_KMS("No active connectors!\n");
-        mutex_unlock(&dev->mode_config.mutex);
+        return tmp;
-        return -1;
+    };
     };
     return NULL;
     dbgprintf("CRTC %p\n", crtc);
     if(crtc == NULL)
 struct drm_crtc *get_possible_crtc(struct drm_device *dev, struct drm_encoder *encoder)
-        struct drm_crtc *tmp_crtc;
-        int crtc_mask = 1;
+    {
+        struct drm_crtc *tmp_crtc;
-        list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head)
+        int crtc_mask = 1;
-            dbgprintf("tmp_crtc %p\n", tmp_crtc);
+        list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head)
             if (encoder->possible_crtcs & crtc_mask)
+            if (encoder->possible_crtcs & crtc_mask)
+            {
+            encoder->crtc = tmp_crtc;
+            dbgprintf("CRTC %p\n", tmp_crtc);
+            return tmp_crtc;
+            };
+            crtc_mask <<= 1;
+        };
+    return NULL;
+    };
+int get_boot_mode(struct drm_connector *connector, videomode_t *usermode)
+{
+    struct drm_display_mode *mode;
+    list_for_each_entry(mode, &connector->modes, head)
+    {
+        dbgprintf("check mode w:%d h:%d %dHz\n",
+                drm_mode_width(mode), drm_mode_height(mode),
+                drm_mode_vrefresh(mode));
+        if( os_display->width  == drm_mode_width(mode)  &&
+            os_display->height == drm_mode_height(mode) &&
+            drm_mode_vrefresh(mode) == 60)
+        {
+            usermode->width  = os_display->width;
+            usermode->height = os_display->height;
+            usermode->freq   = 60;
+            return 1;
+        }
+    }
+    return 0;
+}
+int init_display_kms(struct drm_device *dev, videomode_t *usermode)
+{
+    struct drm_connector    *connector;
+    struct drm_connector_helper_funcs *connector_funcs;
+    struct drm_encoder      *encoder;
+    struct drm_crtc         *crtc;
+    struct drm_framebuffer  *fb;
+    cursor_t  *cursor;
+    u32_t      ifl;
+    int        err;
+    ENTER();
+    mutex_lock(&dev->mode_config.mutex);
+    connector = get_active_connector(dev) ;
+    if(connector == NULL)
+    {
+        DRM_DEBUG_KMS("No active connectors!\n");
+        mutex_unlock(&dev->mode_config.mutex);
-                crtc = tmp_crtc;
+        return -1;
-                encoder->crtc = crtc;
+    };
                 dbgprintf("CRTC %p\n", crtc);
-                break;
+    encoder = connector->encoder;
     if( (usermode->width == 0) ||
         (usermode->height == 0))
+    {
-        struct drm_display_mode *mode;
-        list_for_each_entry(mode, &connector->modes, head)
+        if( !get_boot_mode(connector, usermode))
+        {
-            dbgprintf("check mode w:%d h:%d %dHz\n",
-                    drm_mode_width(mode), drm_mode_height(mode),
-                    drm_mode_vrefresh(mode));
-            if( os_display->width  == drm_mode_width(mode)  &&
-                os_display->height == drm_mode_height(mode) &&
-                drm_mode_vrefresh(mode) == 60)
+        struct drm_display_mode *mode;
-            {
-                usermode->width  = os_display->width;
-                usermode->height = os_display->height;
-                usermode->freq   = 60;
-                break;
-            }
-        }
-        if( usermode->width  == 0 ||
-            usermode->height == 0)
-            mode = list_entry(connector->modes.next, typeof(*mode), head);
             mode = list_entry(connector->modes.next, typeof(*mode), head);
             usermode->width  = drm_mode_width(mode);
             usermode->height = drm_mode_height(mode);
             usermode->freq   = drm_mode_vrefresh(mode);
         };
 };
 void i915_dpms(struct drm_device *dev, int mode)
+{
-    struct drm_connector_funcs *f = os_display->connector->funcs;
+    const struct drm_connector_funcs *f = os_display->connector->funcs;
     f->dpms(os_display->connector, mode);
 };
     move_cursor_kms(cursor, intel_crtc->cursor_x, intel_crtc->cursor_y);
     return old;
 };
-struct sna_fb
+int i915_fbinfo(struct drm_i915_fb_info *fb)
-{
-    uint32_t  width;
-    uint32_t  height;
-    uint32_t  pitch;
+{
-    uint32_t  tiling;
-};
+    struct drm_i915_gem_object *obj = get_fb_obj();
 int i915_fbinfo(struct sna_fb *fb)
     fb->name   = obj->base.name;
     fb->width  = os_display->width;
     fb->height = os_display->height;
-    fb->pitch  = os_display->pitch;
+    fb->pitch  = obj->stride;
-    fb->tiling = 0;
+    fb->tiling = obj->tiling_mode;
     return 0;
     return 0;
 };
 typedef struct
+{
     int left;
-    int top;
-    int right;
-    int bottom;
-}rect_t;
-struct drm_i915_mask {
-    __u32 handle;
-    __u32 width;
-    __u32 height;
+    int top;
-    __u32 bo_size;
+    int right;
-    __u32 bo_pitch;
+    int bottom;
     struct drm_gem_object *obj;
     static unsigned int mask_seqno[256];
     rect_t winrc;
     u32    slot;
-    int    ret;
+    int    ret=0;
      if(mask->handle == -2)
+     {
         printf("%s handle %d\n", __FUNCTION__, mask->handle);
         return 0;
         u32 ifl;
         ret = i915_mutex_lock_interruptible(dev);
         if (ret)
-            return ret;
+            goto err1;
         ret = i915_gem_object_set_to_cpu_domain(to_intel_bo(obj), true);
         if(ret !=0 )
         {
-            dbgprintf("%s fail\n", __FUNCTION__);
+            dbgprintf("%s: i915_gem_object_set_to_cpu_domain failed\n", __FUNCTION__);
-            return ret;
+            goto err2;
         };
+                }
             };
         };
         safe_sti(ifl);
-    drm_gem_object_unreference(obj);
+        ret = i915_gem_object_set_to_gtt_domain(to_intel_bo(obj), false);
+        if(ret != 0 )
+        {
+            dbgprintf("%s: i915_gem_object_set_to_gtt_domain failed\n", __FUNCTION__);
+        };
+    }
 err2:
+    mutex_unlock(&dev->struct_mutex);
+err1:
-    mutex_unlock(&dev->struct_mutex);
+    drm_gem_object_unreference(obj);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/kms_display.c @ 4293 – Rev 4293 → 4371