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

 #include "i915_drv.h"
 #include
 #include
-#include
 #include
 #include
 #include
 struct drm_device *main_device;
 struct drm_file   *drm_file_handlers[256];
 videomode_t usermode;
 void cpu_detect1();
-void cpu_detect();
+int kmap_init();
     };
     asm volatile ("int $0x40"::"a"(-1));
 }
-u32_t  __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
+u32  __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
+{
     static pci_dev_t device;
     };
     if( GetService("DISPLAY") != 0 )
         return 0;
-    printf("\ni915 v3.17-rc5 build %s %s\nusage: i915 [options]\n"
+    printf("\ni915 v3.19-rc2 build %s %s\nusage: i915 [options]\n"
            "-pm=<0,1>     Enable powersavings, fbc, downclocking, etc. (default: 1 - true)\n",
            __DATE__, __TIME__);
     printf("-rc6=<-1,0-7> Enable power-saving render C-state 6.\n"
+        {
             printf("Can't open %s\nExit\n", log);
             return 0;
+    }
-    cpu_detect();
+    cpu_detect1();
 //    dbgprintf("\ncache line size %d\n", x86_clflush_size);
     err = enum_pci_devices();
     if( unlikely(err != 0) )
+    {
         dbgprintf("Device enumeration failed\n");
+        return 0;
+    }
+    err = kmap_init();
+    if( unlikely(err != 0) )
+    {
+        dbgprintf("kmap initialization failed\n");
         return 0;
+    }
 int _stdcall display_handler(ioctl_t *io)
+{
     struct drm_file *file;
     int    retval = -1;
-    u32_t *inp;
+    u32 *inp;
-    u32_t *outp;
+    u32 *outp;
     inp = io->input;
 #define PCI_CLASS_REVISION      0x08
 #define PCI_CLASS_DISPLAY_VGA   0x0300
 #define PCI_CLASS_BRIDGE_HOST   0x0600
 #define PCI_CLASS_BRIDGE_ISA    0x0601
-int pci_scan_filter(u32_t id, u32_t busnr, u32_t devfn)
+int pci_scan_filter(u32 id, u32 busnr, u32 devfn)
 {
-    u16_t vendor, device;
+    u16 vendor, device;
-    u32_t class;
+    u32 class;
     int   ret = 0;
+    }
     return ret;
 };
-static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
-                unsigned int *ecx, unsigned int *edx)
-{
-    /* ecx is often an input as well as an output. */
-    asm volatile("cpuid"
-        : "=a" (*eax),
-          "=b" (*ebx),
-          "=c" (*ecx),
-          "=d" (*edx)
-        : "0" (*eax), "2" (*ecx)
-        : "memory");
-}
-static inline void cpuid(unsigned int op,
-                         unsigned int *eax, unsigned int *ebx,
-                         unsigned int *ecx, unsigned int *edx)
-{
-        *eax = op;
-        *ecx = 0;
-        __cpuid(eax, ebx, ecx, edx);
 struct mtrr
 {
-    u64_t  base;
+    u64  base;
-    u64_t  mask;
+    u64  mask;
 };
 struct cpuinfo
 {
-    u64_t  caps;
+    u64  caps;
-    u64_t  def_mtrr;
+    u64  def_mtrr;
-    u64_t  mtrr_cap;
+    u64  mtrr_cap;
     int    var_mtrr_count;
     int    fix_mtrr_count;
 #define MTRR_UC                 0
 #define MTRR_WC                 1
 #define MTRR_WB                 6
-static inline u64_t read_msr(u32_t msr)
+static inline u64 read_msr(u32 msr)
 {
     union {
-        u64_t  val;
+        u64  val;
         struct {
-            u32_t low;
+            u32 low;
-            u32_t high;
+            u32 high;
         };
     }tmp;
     asm volatile (
     "rdmsr"
     : "=a" (tmp.low), "=d" (tmp.high)
     : "c" (msr));
     return tmp.val;
+}
-static inline void write_msr(u32_t msr, u64_t val)
+static inline void write_msr(u32 msr, u64 val)
 {
     union {
-        u64_t  val;
+        u64  val;
         struct {
-            u32_t low;
+            u32 low;
-            u32_t high;
+            u32 high;
         };
     }tmp;
-    tmp.val = val;
-    asm volatile (
-    "wrmsr"
-    :: "a" (tmp.low), "d" (tmp.high), "c" (msr));
-}
-#define rdmsr(msr, low, high)                                   \
-do {                                                            \
-       u64 __val = read_msr((msr));                     \
-       (void)((low) = (u32)__val);                             \
-       (void)((high) = (u32)(__val >> 32));                    \
-} while (0)
-static inline void native_write_msr(unsigned int msr,
-                                    unsigned low, unsigned high)
-{
-    asm volatile("wrmsr" : : "c" (msr), "a"(low), "d" (high) : "memory");
     tmp.val = val;
-static inline void wbinvd(void)
+    asm volatile (
     "wrmsr"
         native_write_msr(MTRRphysBase_MSR(reg), base_lo, base_hi);
         native_write_msr(MTRRphysMask_MSR(reg), mask_lo, mask_hi);
     };
+}
-static unsigned long __force_order;
-static inline unsigned long read_cr0(void)
-{
-    unsigned long val;
-    asm volatile("mov %%cr0,%0\n\t" : "=r" (val), "=m" (__force_order));
-    return val;
-}
-static inline void write_cr0(unsigned long val)
-{
-    asm volatile("mov %0,%%cr0": : "r" (val), "m" (__force_order));
-}
-static inline unsigned long read_cr4(void)
-{
-    unsigned long val;
-    asm volatile("mov %%cr4,%0\n\t" : "=r" (val), "=m" (__force_order));
-    return val;
-}
-static inline void write_cr4(unsigned long val)
-{
-    asm volatile("mov %0,%%cr4": : "r" (val), "m" (__force_order));
-}
-static inline unsigned long read_cr3(void)
-{
-    unsigned long val;
-    asm volatile("mov %%cr3,%0\n\t" : "=r" (val), "=m" (__force_order));
-    return val;
-}
-static inline void write_cr3(unsigned long val)
-{
-    asm volatile("mov %0,%%cr3": : "r" (val), "m" (__force_order));
 static u32 deftype_lo, deftype_hi;
-void cpu_detect()
+void cpu_detect1()
+{
     struct cpuinfo cpuinfo;
     u32 junk, tfms, cap0, misc;
     int i;
 #if 0
     cpuid(0x00000001, &tfms, &misc, &junk, &cap0);
     if (cap0 & (1<<19))
     if (cap0 & (1<<19))
         x86_clflush_size = ((misc >> 8) & 0xff) * 8;
         x86_clflush_size = ((misc >> 8) & 0xff) * 8;
     : "0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)
     : "dx", "di");
 return __res;
+}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/main.c – Rev 5128 → 5354