public inbox for gentoo-user@lists.gentoo.org
 help / color / mirror / Atom feed
From: walt <w41ter@gmail.com>
To: gentoo-user@lists.gentoo.org
Subject: [gentoo-user] Re: [PATCH]  Linus breaks ati-drivers again
Date: Mon, 15 Oct 2012 10:30:59 -0700	[thread overview]
Message-ID: <507C4853.4070107@gmail.com> (raw)
In-Reply-To: <k5hc7r$792$1@ger.gmane.org>

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]


Well, this is really a temporary workaround for people who like to
run the latest git kernel from Linus, and it's only tested for
ati-drivers-12.9_beta, and only on ~amd_64.
  


[-- Attachment #2: ati.patch --]
[-- Type: text/x-patch, Size: 3601 bytes --]

--- common/lib/modules/fglrx/build_mod/firegl_public.orig	2012-10-15 10:10:58.593454377 -0700
+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2012-10-15 10:12:56.453972670 -0700
@@ -3892,7 +3892,7 @@
                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                 return -EAGAIN;
             }
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
             vma->vm_ops = &vm_ops;
 			break;
 
@@ -3922,14 +3922,14 @@
                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                 return -EAGAIN;
             }
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
             vma->vm_ops = &vm_ops;
             }
 			break;
 #endif                    
 
         case __KE_SHM:
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
             vma->vm_ops = &vm_shm_ops;
             break;
 
@@ -3937,7 +3937,7 @@
 
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 
-            vma->vm_flags |= VM_RESERVED;
+            vma->vm_flags |= VM_IO;
 
             //vma->vm_flags |=  VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
             //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
@@ -3946,14 +3946,14 @@
 
         case __KE_CTX:
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_IO; /* Don't swap */
             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
             vma->vm_ops = &vm_ctx_ops;
             break;
 
         case __KE_PCI_BQS:
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_IO; /* Don't swap */
             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
             vma->vm_ops = &vm_pci_bq_ops;
             break;
@@ -3984,9 +3984,9 @@
                     return -EAGAIN;
                 }
 #ifdef __x86_64__
-                vma->vm_flags |= VM_RESERVED;
+                vma->vm_flags |= VM_IO;
 #else
-                vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+                vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
 #endif
                 vma->vm_ops = &vm_ops;
             }
@@ -4015,9 +4015,9 @@
                     return -EAGAIN;
                 }
 #ifdef __x86_64__
-                vma->vm_flags |= VM_RESERVED;
+                vma->vm_flags |= VM_IO;
 #else
-                vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+                vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
 #endif
                 vma->vm_ops = &vm_agp_bq_ops;
             }
@@ -4025,7 +4025,7 @@
 #endif /* __AGP__BUILTIN__ */
 
         case __KE_KMAP:
-		    vma->vm_flags |= VM_SHM | VM_RESERVED;
+		    vma->vm_flags |= VM_SHM | VM_IO;
             vma->vm_ops = &vm_kmap_ops;
             if (readonly && (vma->vm_flags & VM_WRITE))
             {
@@ -4046,7 +4046,7 @@
 #endif            
             // fall through
          case __KE_GART_CACHEABLE:
-             vma->vm_flags |= VM_RESERVED;
+             vma->vm_flags |= VM_IO;
              vma->vm_ops = &vm_gart_ops;
              break;
         default:

  reply	other threads:[~2012-10-15 17:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-15 16:05 [gentoo-user] [PATCH] Linus breaks nvidia-drivers again walt
2012-10-15 17:30 ` walt [this message]
2012-10-15 17:33 ` [gentoo-user] Re: [PATCH] Linus breaks virtualbox-modules again walt
2012-10-15 18:10 ` [gentoo-user] [PATCH] Linus breaks nvidia-drivers again Walter Dnes
2012-10-15 18:19   ` pk
2012-10-15 18:59     ` Walter Dnes
2012-10-15 23:21   ` [gentoo-user] " walt
2012-10-16  7:30     ` microcai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=507C4853.4070107@gmail.com \
    --to=w41ter@gmail.com \
    --cc=gentoo-user@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox