Attachment 49575 Details for Bug 115800

[patch] Regenerated consecutive patch

nv-fix-gartaddr-xen-disable_pat.diff (text/plain), 2.38 KB, created by Stefan Dirsch on 2005-09-12 09:07:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2005-09-12 09:07:02 UTC

Size: 2.38 KB

patch

obsolete

>diff -u NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv/nv-linux.h
>--- NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv/nv-linux.h	2005-09-09 11:24:48.152130352 +0200
>+++ NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv/nv-linux.h	2005-09-12 10:10:00.019875543 +0200
>@@ -120,16 +120,16 @@
> #include <linux/agpgart.h>
> #include <asm/agp.h>
>+#endif
> #ifndef phys_to_gart
>-#define phys_to_gart(x) (virt_to_bus(phys_to_virt(x)))
>-#define gart_to_phys(x) (virt_to_phys(bus_to_virt(x)))
>-#define virt_to_gart(x) (virt_to_bus(x))
>-#define gart_to_virt(x) (bus_to_virt(x))
>+#define phys_to_gart(x) virt_to_bus(phys_to_virt(x))
>+#define gart_to_phys(x) virt_to_phys(bus_to_virt(x))
>+#define virt_to_gart(x) virt_to_bus(x)
>+#define gart_to_virt(x) bus_to_virt(x)
> #else
> #ifndef virt_to_gart
> #define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))
> #define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))
> #endif
> #endif
>-#endif
> 
> #if defined(NVCPU_X86) || defined(NVCPU_X86_64)
>only in patch2:
>unchanged:
>--- NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv.orig/nv.c	2005-07-29 22:30:43.000000000 +0200
>+++ NVIDIA-Linux-x86-1.0-7676-pkg1/usr/src/nv/nv.c	2005-09-12 10:09:18.802027642 +0200
>@@ -35,7 +35,13 @@ static struct pm_dev *apm_nv_dev[NV_MAX_
> 
> int nv_pat_enabled = 0;
> 
>+#ifdef CONFIG_XEN
>+static int nv_enable_xen=0;
>+NV_MODULE_PARAMETER(nv_enable_xen);
>+static int nv_disable_pat = 1;
>+#else
> static int nv_disable_pat = 0;
>+#endif
> NV_MODULE_PARAMETER(nv_disable_pat);
> 
> /*
>@@ -751,8 +757,10 @@ static inline void __nv_disable_caches(u
>     unsigned long cr0 = read_cr0();
>     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
>     wbinvd();
>+#ifndef CONFIG_XEN
>     *cr4 = read_cr4();
>     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
>+#endif
>     __flush_tlb();
> }
> 
>@@ -762,7 +770,9 @@ static inline void __nv_enable_caches(un
>     wbinvd();
>     __flush_tlb();
>     write_cr0((cr0 & 0x9fffffff));
>+#ifndef CONFIG_XEN
>     if (cr4 & 0x80) write_cr4(cr4);
>+#endif
> }
> 
> static int __check_pat_support()
>@@ -993,6 +1003,11 @@ static int __init nvidia_init_module(voi
>         nv_printf(NV_DBG_ERRORS, "NVRM: No NVIDIA graphics adapter found!\n");
>         return -ENODEV;
>     }
>+#ifdef CONFIG_XEN
>+    printk("NVIDIA driver not yet supported on xen, override with nv_enable_xen=1\n");
>+    if (!nv_enable_xen)
>+	    return -ENODEV;
>+#endif
> 
>     memset(nv_linux_devices, 0, sizeof(nv_linux_devices));
>

Actions: View | Diff

Attachments on bug 115800: 49159 | 49160 | 49511 | 49567 | 49575