WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/rdisplay.c

     int  vrefresh;
     int  pitch;
     int  lfb;
+    int  supported_modes;
     struct drm_device *ddev;
+    struct drm_connector *connector;
     struct drm_crtc   *crtc;
     struct list_head   cursors;
     return name;
+}
+bool set_mode(struct drm_device *dev, struct drm_connector *connector,
-bool set_mode(struct drm_device *dev, int width, int height)
+              mode_t *reqmode, bool strict)
 {
-    struct drm_connector *connector;
+    struct drm_display_mode  *mode = NULL, *tmpmode;
     bool ret = false;
+    ENTER();
+    list_for_each_entry(tmpmode, &connector->modes, head)
+    {
-    ENTER();
+        if( (drm_mode_width(tmpmode)    == reqmode->width)  &&
+            (drm_mode_height(tmpmode)   == reqmode->height) &&
+            (drm_mode_vrefresh(tmpmode) == reqmode->freq) )
+        {
+            mode = tmpmode;
+            break;
+        }
+    };
+    if( (mode == NULL) && (strict == false) )
+    {
+        list_for_each_entry(tmpmode, &connector->modes, head)
+        {
+            if( (drm_mode_width(tmpmode)    == reqmode->width)  &&
+                (drm_mode_height(tmpmode)   == reqmode->height) )
+            {
+                mode = tmpmode;
+                break;
+            }
+        };
     };
     list_for_each_entry(connector, &dev->mode_config.connector_list, head)
-    {
+    if( mode != NULL )
-        struct drm_display_mode *mode;
+    {
+        struct drm_framebuffer   *fb;
         struct drm_encoder  *encoder;
-        struct drm_encoder  *encoder;
-        struct drm_crtc     *crtc;
-        if( connector->status != connector_status_connected)
+        struct drm_crtc     *crtc;
-            continue;
-        encoder = connector->encoder;
-        if( encoder == NULL)
-            continue;
-        crtc = encoder->crtc;
-        if(crtc == NULL)
-            continue;
-        list_for_each_entry(mode, &connector->modes, head)
-        {
-            char *con_name, *enc_name;
-            struct drm_framebuffer *fb;
+        char  con_edid[128];
         char *con_name;
                 con_name = drm_get_connector_name(connector);
                 enc_name = drm_get_encoder_name(encoder);
                 dbgprintf("set mode %d %d connector %s encoder %s\n",
-                           width, height, con_name, enc_name);
+                   reqmode->width, reqmode->height, con_name, enc_name);
-                fb->width = width;
+        fb->width  = reqmode->width;
-                fb->height = height;
+        fb->height = reqmode->height;
-                fb->pitch = radeon_align_pitch(dev->dev_private, width, 32, false) * ((32 + 1) / 8);
+        fb->pitch  = radeon_align_pitch(dev->dev_private, reqmode->width, 32, false) * ((32 + 1) / 8);
                 crtc->fb = fb;
+                crtc->enabled = true;
+                rdisplay->crtc = crtc;
                 crtc->enabled = true;
-                rdisplay->crtc = crtc;
+                ret = drm_crtc_helper_set_mode(crtc, mode, 0, 0, fb);
+        if (ret == true)
                 ret = drm_crtc_helper_set_mode(crtc, mode, 0, 0, fb);
+                rdisplay->width  = fb->width;
-                rdisplay->width  = fb->width;
                 rdisplay->height = fb->height;
                 rdisplay->pitch  = fb->pitch;
             rdisplay->vrefresh = drm_mode_vrefresh(mode);
-                sysSetScreen(fb->width, fb->height, fb->pitch);
-                if (ret == true)
+                sysSetScreen(fb->width, fb->height, fb->pitch);
-                {
-                    dbgprintf("new mode %d %d pitch %d\n",fb->width, fb->height, fb->pitch);
+            dbgprintf("new mode %d x %d pitch %d\n",
-                }
-                else
+                       fb->width, fb->height, fb->pitch);
+                }
+                else
+                    DRM_ERROR("failed to set mode %d_%d on crtc %p\n",
+                               fb->width, fb->height, crtc);
+    }
+    LEAVE();
+    return ret;
+};
-                    DRM_ERROR("failed to set mode %d_%d on crtc %p\n",
-                               fb->width, fb->height, crtc);
+static int count_connector_modes(struct drm_connector* connector)
-                };
+{
-                LEAVE();
+    struct drm_display_mode  *mode;
+    int count = 0;
+    list_for_each_entry(mode, &connector->modes, head)
+    {
+        count++;
-                return ret;
+                };
+    return count;
+};
+static struct drm_connector* get_def_connector(struct drm_device *dev)
+{
+    struct drm_connector  *connector;
+    struct drm_connector  *def_connector = NULL;
+    list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+    {
+        struct drm_encoder  *encoder;
+        struct drm_crtc     *crtc;
+        if( connector->status != connector_status_connected)
+            continue;
+        encoder = connector->encoder;
+        if( encoder == NULL)
+            continue;
+        if( encoder->encoder_type == DRM_MODE_ENCODER_TVDAC )
+        {
+            dbgprintf("skip tvdac encoder %s connector %s\n",
+                      drm_get_encoder_name(encoder),
+                      drm_get_connector_name(connector));
+            continue;
+            };
+        crtc = encoder->crtc;
+        if(crtc == NULL)
+            continue;
-            };
+        def_connector = connector;
+        break;
     };
     };
-    LEAVE();
+    return def_connector;
-    return ret;
+};
 };
 bool init_display(struct radeon_device *rdev, mode_t *usermode)
+{
+    struct drm_device  *dev;
+    cursor_t  *cursor;
+    bool                retval = false;
+    ENTER();
+    rdisplay = GetDisplay();
 int init_display(struct radeon_device *rdev, mode_t *usermode)
     dev = rdisplay->ddev = rdev->ddev;
     cursor_t  *cursor;
+    list_for_each_entry(cursor, &rdisplay->cursors, list)
     ENTER();
         init_cursor(cursor);
+    };
+    rdisplay->connector = get_def_connector(dev);
+    if( rdisplay->connector == 0 )
-    rdisplay = GetDisplay();
+        return false;
+    rdisplay->supported_modes = count_connector_modes(rdisplay->connector);
     if( (usermode->width != 0) &&
-    rdisplay->ddev = rdev->ddev;
+        (usermode->height != 0) )
+    {
     rdisplay->restore_cursor = restore_cursor;
     LEAVE();
-    return 1;
+    return retval;
 };
 static int my_atoi(char **cmd)
+    {
         p--;
         mode->width = my_atoi(&p);
-        p++;
+        if(*p == 'x') p++;
+        mode->height = my_atoi(&p);
+        if(*p == 'x') p++;
-        mode->height = my_atoi(&p);
-        p++;
+        mode->bpp = 32;
+        mode->freq = my_atoi(&p);
         if( mode->freq == 0 )
-        mode->freq = my_atoi(&p);
+            mode->freq = 60;
+    }
         c = *p++;
     };
 };
+int get_modes(mode_t *mode, int *count)
+{
+    int err = -1;
+    ENTER();
+    dbgprintf("mode %x count %d\n", mode, *count);
+    if( *count == 0 )
+    {
+        *count = rdisplay->supported_modes;
+        err = 0;
+    }
+    else if( mode != NULL )
+    {
+        struct drm_display_mode  *drmmode;
+        int i = 0;
+        if( *count > rdisplay->supported_modes)
+            *count = rdisplay->supported_modes;
+        list_for_each_entry(drmmode, &rdisplay->connector->modes, head)
+        {
+            if( i < *count)
+            {
+                mode->width  = drm_mode_width(drmmode);
+                mode->height = drm_mode_height(drmmode);
+                mode->bpp    = 32;
+                mode->freq   = drm_mode_vrefresh(drmmode);
+                i++;
+                mode++;
+            }
+            else break;
+        };
+        *count = i;
+        err = 0;
+    };
+    LEAVE();
+    return err;
+}
+int set_user_mode(mode_t *mode)
+{
+    int err = -1;
+    if( (mode->width  != 0)  &&
+        (mode->height != 0)  &&
+        (mode->freq   != 0 ) )
+    {
+        if( set_mode(rdisplay->ddev, rdisplay->connector, mode, true) )
+            err = 0;
+    };
+    return err;
+};

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/rdisplay.c – Rev 1233 → 1239