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

 #include
 #include
 #include
 #include
+#include "getopt.h"
+#include "bitmap.h"
-#include "bitmap.h"
+#include "i915_kos32.h"
 #define DRV_NAME "i915 v4.4"
-#define I915_DEV_CLOSE 0
-#define I915_DEV_INIT  1
-#define I915_DEV_READY 2
-struct pci_device {
-    uint16_t    domain;
-    uint8_t     bus;
+#define I915_DEV_CLOSE 0
-    uint8_t     dev;
-    uint8_t     func;
-    uint16_t    vendor_id;
-    uint16_t    device_id;
-    uint16_t    subvendor_id;
-    uint16_t    subdevice_id;
-    uint32_t    device_class;
-    uint8_t     revision;
-};
-struct cmdtable
-{
-    char *key;
-    int   size;
-    int  *val;
+#define I915_DEV_INIT  1
-};
-#define CMDENTRY(key, val) {(key), (sizeof(key)-1), &val}
-void parse_cmdline(char *cmdline, struct cmdtable *table, char *log, videomode_t *mode);
-int oops_in_progress;
-int i915_fbsize = 16;
-struct drm_device *main_device;
+#define I915_DEV_READY 2
 struct drm_file   *drm_file_handlers[256];
-videomode_t usermode;
-void cpu_detect1();
-int kmap_init();
-int _stdcall display_handler(ioctl_t *io);
-int init_agp(void);
-void get_pci_info(struct pci_device *dev);
-int i915_getparam(struct drm_device *dev, void *data,
-             struct drm_file *file_priv);
-int i915_mask_update(struct drm_device *dev, void *data,
-            struct drm_file *file);
-struct cmdtable cmdtable[]= {
-    CMDENTRY("-FB=", i915_fbsize),
-/*    CMDENTRY("-pm=", i915.powersave),     */
-    CMDENTRY("-rc6=", i915.enable_rc6),
-    CMDENTRY("-fbc=", i915.enable_fbc),
-    CMDENTRY("-ppgt=", i915.enable_ppgtt),
-    {NULL, 0}
-};
+static int my_atoi(char **cmd);
-static char  log[256];
+static char* parse_mode(char *p, videomode_t *mode);
-unsigned long volatile jiffies;
+void cpu_detect1();
 int kmap_init();
-struct workqueue_struct *system_wq;
-int driver_wq_state;
-int x86_clflush_size;
-unsigned int tsc_khz;
-int i915_modeset = 1;
-typedef union __attribute__((packed))
+unsigned long volatile jiffies;
-{
-    uint32_t val;
+int oops_in_progress;
-    struct
-    {
-        uint8_t   state;
-        uint8_t   code;
+int x86_clflush_size;
-        uint16_t  ctrl_key;
-    };
+unsigned int tsc_khz;
-}oskey_t;
+struct workqueue_struct *system_wq;
-static inline oskey_t get_key(void)
-{
-    oskey_t val;
-    asm volatile("int $0x40":"=a"(val):"a"(2));
+int driver_wq_state;
-    return val;
+struct drm_device *main_device;
-};
+struct drm_file   *drm_file_handlers[256];
 videomode_t usermode;
 u32  __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
+{
     static pci_dev_t device;
-    const struct pci_device_id  *ent;
+    const struct pci_device_id  *ent;
     char *safecmdline;
     int err = 0;
     if(action != 1)
     if( GetService("DISPLAY") != 0 )
         return 0;
+    printf("\n%s build %s %s\nusage: i915 [options]\n"
-    printf("\n%s build %s %s\nusage: i915 [options]\n"
-           "-FB=<0-9>     Set framebuffer size in megabytes (default: 16)\n",
+           "-f\n"
-           "-pm=<0,1>     Enable powersavings, fbc, downclocking, etc. (default: 1 - true)\n",
+           "--fbsize <0-9>  Set framebuffer size in megabytes (default: 16)\n",
            DRV_NAME, __DATE__, __TIME__);
+    printf("--rc6 <-1,0-7>  Enable power-saving render C-state 6.\n"
-    printf("-rc6=<-1,0-7> Enable power-saving render C-state 6.\n"
+           "                Different stages can be selected via bitmask values\n"
+           "                (0 = disable; 1 = enable rc6; 2 = enable deep rc6;\n"
-           "              Different stages can be selected via bitmask values\n"
+           "                4 = enable deepest rc6).\n"
-           "              (0 = disable; 1 = enable rc6; 2 = enable deep rc6; 4 = enable deepest rc6).\n"
+           "                For example, 3 would enable rc6 and deep rc6,\n"
-           "              For example, 3 would enable rc6 and deep rc6, and 7 would enable everything.\n"
+           "                and 7 would enable everything.\n"
-           "              default: -1 (use per-chip default)\n");
+           "                default: -1 (use per-chip default)\n");
-    printf("-fbc=<-1,0,1> Enable frame buffer compression for power savings\n"
-           "              (default: -1 (use per-chip default))\n");
+    printf("--fbc <-1,0,1>  Enable frame buffer compression for power savings\n"
+           "                (default: -1 (use per-chip default))\n");
-    printf("-ppgt=<0,1>   Enable PPGTT (default: true)\n");
+    printf("-l\n"
+           "--log     path to log file\n");
+    printf("-m\n"
+           "--mode  set videomode\n");
-    printf("-l      path to log file\n");
+    printf("-v\n"
+           "--video :x[M][R][-][@][i][m][eDd]\n"
+           "                set videomode for CONNECTOR\n");
+    if( cmdline && *cmdline )
+    {
+        int argc, i, c;
+        char **argv;
+        safecmdline = __builtin_strdup(cmdline);
-    printf("-m    set videomode\n");
+        printf("cmdline %s\n", safecmdline);
+        argc = split_cmdline(safecmdline, NULL);
+        argv = __builtin_malloc((argc+1)*sizeof(char*));
+        split_cmdline(safecmdline, argv);
+        argv[argc] = NULL;
+        while(1)
+        {
+            static struct option long_options[] =
+            {
+                {"log",   required_argument, 0, 'l'},
+                {"mode",  required_argument, 0, 'm'},
+                {"fbsize",required_argument, 0, 'f'},
+                {"video", required_argument, 0, 'v'},
+                {"rc6", required_argument, 0, OPTION_RC6},
+                {"fbc", required_argument, 0, OPTION_FBC},
+                {0, 0, 0, 0}
+            };
+            int option_index = 0;
+            c = getopt_long (argc, argv, "f:l:m:v:",
+                            long_options, &option_index);
     printf("cmdline %s\n", cmdline);
+            if (c == -1)
+                break;
+            switch(c)
+            {
+                case OPTION_RC6:
+                    i915.enable_rc6 = my_atoi(&optarg);
+                    printf("i915.rc6 = %d\n",i915.enable_rc6);
+                    break;
+                case OPTION_FBC:
+                    i915.enable_fbc = my_atoi(&optarg);
+                    printf("i915.fbc = %d\n",i915.enable_fbc);
+                    break;
+                case 'f':
+                    i915.fbsize = my_atoi(&optarg);
+                    printf("i915.fbsize =%d\n",i915.fbsize);
+                    break;
+                case 'l':
+                    i915.log_file = optarg;
+                    break;
+                case 'm':
+                    parse_mode(optarg, &usermode);
+                    break;
+                case 'v':
+                    i915.cmdline_mode = optarg;
+                    printf("i915.cmdline_mode =%s\n",i915.cmdline_mode);
+                    break;
+            }
-    if( cmdline && *cmdline )
+        }
-        parse_cmdline(cmdline, cmdtable, log, &usermode);
+    };
-    if( *log && !dbg_open(log))
+    if( i915.log_file && !dbg_open(i915.log_file))
+    {
-        printf("Can't open %s\nExit\n", log);
+        printf("Can't open %s\nExit\n", i915.log_file);
         return 0;
+    }
-    else
     else
         dbgprintf("\nLOG: %s build %s %s\n",DRV_NAME,__DATE__, __TIME__);
         dbgprintf("\nLOG: %s build %s %s\n",DRV_NAME,__DATE__, __TIME__);
+    }
         dbgprintf("Set DISPLAY handler\n");
     return err;
+};
+int do_command_line(const char* usercmd)
+{
+    char *cmdline;
+    int argc, i, c;
+    char **argv;
+    if( (usercmd == NULL) || (*usercmd == 0) )
+        return 1;
+    cmdline = __builtin_strdup(usercmd);
+    printf("cmdline %s\n", cmdline);
+    argc = split_cmdline(cmdline, NULL);
+    argv = __builtin_malloc((argc+1)*sizeof(char*));
+    split_cmdline(cmdline, argv);
+    argv[argc] = NULL;
+    __getopt_initialized = 0;
+    while(1)
+    {
+        static struct option long_options[] =
+        {
+            {"video", required_argument, 0, 'v'},
+            {0, 0, 0, 0}
+        };
+        int option_index = 0;
+        c = getopt_long (argc, argv, "v:",
+                        long_options, &option_index);
+        if (c == -1)
+            break;
+        switch(c)
+        {
+            case 'v':
+                printf("cmdline_mode %s\n",optarg);
+                set_cmdline_mode_ext(main_device, optarg);
+                break;
+        }
+    }
+    __builtin_free(argv);
+    __builtin_free(cmdline);
-};
+    return 0;
 };
 #define SRV_GETVERSION              0
 #define SRV_ENUM_MODES              1
 #define SRV_SET_MODE                2
-#define SRV_GET_CAPS                3
+#define SRV_GET_CAPS                3
 #define SRV_CMDLINE                 4
 #define SRV_GET_PCI_INFO                20
 #define SRV_I915_GET_PARAM              21
         case SRV_ENUM_MODES:
 //            dbgprintf("SRV_ENUM_MODES inp %x inp_size %x out_size %x\n",
 //                       inp, io->inp_size, io->out_size );
             check_output(4);
 //            check_input(*outp * sizeof(videomode_t));
-            if( i915_modeset)
-                retval = get_videomodes((videomode_t*)inp, outp);
+            retval = get_videomodes((videomode_t*)inp, outp);
             break;
         case SRV_SET_MODE:
 //            dbgprintf("SRV_SET_MODE inp %x inp_size %x\n",
 //                       inp, io->inp_size);
-            check_input(sizeof(videomode_t));
-            if( i915_modeset )
+            check_input(sizeof(videomode_t));
-                retval = set_user_mode((videomode_t*)inp);
+            retval = set_user_mode((videomode_t*)inp);
             break;
         case SRV_GET_CAPS:
+            retval = get_driver_caps((hwcaps_t*)inp);
+            break;
+        case SRV_CMDLINE:
-            retval = get_driver_caps((hwcaps_t*)inp);
+            retval = do_command_line((char*)inp);
             break;
         case SRV_GET_PCI_INFO:
             return val*sign;
+        }
+    }
+}
-char* parse_mode(char *p, videomode_t *mode)
+static char* parse_mode(char *p, videomode_t *mode)
+{
     char c;
+    }
     return p;
-};
-static char* parse_path(char *p, char *log)
-{
-    char  c;
-    while( (c = *p++) == ' ');
-        p--;
-    while((c = *p++) && (c != ' '))
-        *log++ = c;
-    *log = 0;
-    return p;
-};
-void parse_cmdline(char *cmdline, struct cmdtable *table, char *log, videomode_t *mode)
-{
-    char *p = cmdline;
-    char *p1;
-    int val;
-    char c = *p++;
-    if( table )
-    {
-        while(table->key)
-        {
-            if(p1 = strstr(cmdline, table->key))
-            {
-                p1+= table->size;
-                *table->val = my_atoi(&p1);
-            }
-            table++;
-        }
-    }
-    while( c )
-    {
-        if( c == '-')
-        {
-            switch(*p++)
-            {
-                case 'l':
-                    p = parse_path(p, log);
-                    break;
-                case 'm':
-                    p = parse_mode(p, mode);
-                    break;
-            };
-        };
-        c = *p++;
-    };
-};
-char *strstr(const char *cs, const char *ct)
-{
-int d0, d1;
-register char *__res;
-__asm__ __volatile__(
-    "movl %6,%%edi\n\t"
-    "repne\n\t"
-    "scasb\n\t"
-    "notl %%ecx\n\t"
-    "decl %%ecx\n\t"    /* NOTE! This also sets Z if searchstring='' */
-    "movl %%ecx,%%edx\n"
-    "1:\tmovl %6,%%edi\n\t"
-    "movl %%esi,%%eax\n\t"
-    "movl %%edx,%%ecx\n\t"
-    "repe\n\t"
-    "cmpsb\n\t"
-    "je 2f\n\t"     /* also works for empty string, see above */
-    "xchgl %%eax,%%esi\n\t"
-    "incl %%esi\n\t"
-    "cmpb $0,-1(%%eax)\n\t"
-    "jne 1b\n\t"
-    "xorl %%eax,%%eax\n\t"
-    "2:"
-    : "=a" (__res), "=&c" (d0), "=&S" (d1)
-    : "0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)
-    : "dx", "di");
-return __res;
 };
 #include

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/main.c @ 6015 – Rev 6084 → 6088