1. 08 Jun, 2011 2 commits
  2. 07 Jun, 2011 22 commits
  3. 06 Jun, 2011 16 commits
    • Dave Airlie's avatar
      Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes · dcc32b83
      Dave Airlie authored
      * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
        drm/nv40: fall back to paged dma object for the moment
        drm/nouveau: fix leak of gart mm node
        drm/nouveau: fix vram page mapping when crossing page table boundaries
        drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901).
        drm/nouveau: don't create accel engine objects when noaccel=1
        drm/nvc0: recognise 0xdX chipsets as NV_C0
      dcc32b83
    • Dave Airlie's avatar
      Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes · de52bcab
      Dave Airlie authored
      * 'keithp/drm-intel-fixes' of /ssd/git/drm-next:
        drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007
        drm/i915: Share the common force-audio property between connectors
        drm/i915: Remove unused enum "chip_family"
        drm/915: fix relaxed tiling on gen2: tile height
        drm/i915/crt: Explicitly return false if connected to a digital monitor
        drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
        drm/i915: Only print out the actual number of fences for i915_error_state
        drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/
        drm: i915: correct return status in intel_hdmi_mode_valid()
        drm/i915: fix regression after clock gating init split
        drm/i915: fix if statement in ivybridge irq handler
      de52bcab
    • Ben Skeggs's avatar
      drm/nv40: fall back to paged dma object for the moment · 4cff3ce5
      Ben Skeggs authored
      
      
      PCI(E)GART isn't quite stable it seems, fall back to old method until I get
      the time to sort it out properly.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      4cff3ce5
    • Ben Skeggs's avatar
      drm/nouveau: fix leak of gart mm node · 960bdba0
      Ben Skeggs authored
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      960bdba0
    • Ben Skeggs's avatar
      drm/nouveau: fix vram page mapping when crossing page table boundaries · 73c337e7
      Ben Skeggs authored
      
      
      Hopefully the cause of nvc0 "page jumping" issue.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      73c337e7
    • Francisco Jerez's avatar
    • Ben Skeggs's avatar
      drm/nouveau: don't create accel engine objects when noaccel=1 · 18b54c4d
      Ben Skeggs authored
      
      
      Fixes various potential oopses.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      18b54c4d
    • Ben Skeggs's avatar
      drm/nvc0: recognise 0xdX chipsets as NV_C0 · cdf81a23
      Ben Skeggs authored
      
      
      Should hopefully get modesetting at least from this, it appears these are
      GF119 chipsets.  Accel will come eventually, once I order a board.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      cdf81a23
    • Joerg Roedel's avatar
      x86/amd-iommu: Use only per-device dma_ops · 27c2127a
      Joerg Roedel authored
      
      
      Unfortunatly there are systems where the AMD IOMMU does not
      cover all devices. This breaks with the current driver as it
      initializes the global dma_ops variable. This patch limits
      the AMD IOMMU to the devices listed in the IVRS table fixing
      DMA for devices not covered by the IOMMU.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
      27c2127a
    • Joerg Roedel's avatar
      x86/amd-iommu: Fix 3 possible endless loops · 0de66d5b
      Joerg Roedel authored
      
      
      The driver contains several loops counting on an u16 value
      where the exit-condition is checked against variables that
      can have values up to 0xffff. In this case the loops will
      never exit. This patch fixed 3 such loops.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
      0de66d5b
    • Martin Schwidefsky's avatar
      [S390] fix kvm defines for 31 bit compile · 6c61cfe9
      Martin Schwidefsky authored
      
      
      KVM is not available for 31 bit but the KVM defines cause warnings:
      
      arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_dirty':
      arch/s390/include/asm/pgtable.h:817: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h:818: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_young':
      arch/s390/include/asm/pgtable.h:837: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h:838: warning: integer constant is too large for 'unsigned long' type
      
      Add 31 bit versions of the KVM defines to remove the warnings.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      6c61cfe9
    • Martin Schwidefsky's avatar
      [S390] use generic RCU page-table freeing code · 36409f63
      Martin Schwidefsky authored
      
      
      Replace the s390 specific rcu page-table freeing code with the
      generic variant. This requires to duplicate the definition for the
      struct mmu_table_batch as s390 does not use the generic tlb flush
      code.
      
      While we are at it remove the restriction that page table fragments
      can not be reused after a single fragment has been freed with rcu
      and split out allocation and freeing of page tables with pgstes.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      36409f63
    • Jan Glauber's avatar
      [S390] qdio: Split SBAL entry flags · 3ec90878
      Jan Glauber authored
      
      
      The qdio SBAL entry flag is made-up of four different values that are
      independent of one another. Some of the bits are reserved by the
      hardware and should not be changed by qdio. Currently all four values
      are overwritten since the SBAL entry flag is defined as an u32.
      
      Split the SBAL entry flag into four u8's as defined by the hardware
      and don't touch the reserved bits.
      Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      3ec90878
    • Christian Borntraeger's avatar
      [S390] kvm-s390: fix stfle facilities numbers >=64 · 9950f8be
      Christian Borntraeger authored
      
      
      Currently KVM masks out the known good facilities only for the first
      double word, but passed the 2nd double word without filtering. This
      breaks some code on newer systems:
      
      [    0.593966] ------------[ cut here ]------------
      [    0.594086] WARNING: at arch/s390/oprofile/hwsampler.c:696
      [    0.594213] Modules linked in:
      [    0.594321] Modules linked in:
      [    0.594439] CPU: 0 Not tainted 3.0.0-rc1 #46
      [    0.594564] Process swapper (pid: 1, task: 00000001effa8038, ksp: 00000001effafab8)
      [    0.594735] Krnl PSW : 0704100180000000 00000000004ab89a (hwsampler_setup+0x75a/0x7b8)
      [    0.594910]            R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
      [    0.595120] Krnl GPRS: ffffffff00000000 00000000ffffffea ffffffffffffffea 00000000004a98f8
      [    0.595351]            00000000004aa002 0000000000000001 000000000080e720 000000000088b9f8
      [    0.595522]            000000000080d3e8 0000000000000000 0000000000000000 000000000080e464
      [    0.595725]            0000000000000000 00000000005db198 00000000004ab3a2 00000001effafd98
      [    0.595901] Krnl Code: 00000000004ab88c: c0e5000673ca        brasl   %r14,57a020
      [    0.596071]            00000000004ab892: a7f4fc77            brc     15,4ab180
      [    0.596276]            00000000004ab896: a7f40001            brc     15,4ab898
      [    0.596454]           >00000000004ab89a: a7c8ffa1            lhi     %r12,-95
      [    0.596657]            00000000004ab89e: a7f4fc71            brc     15,4ab180
      [    0.596854]            00000000004ab8a2: a7f40001            brc     15,4ab8a4
      [    0.597029]            00000000004ab8a6: a7f4ff22            brc     15,4ab6ea
      [    0.597230]            00000000004ab8aa: c0200011009a        larl    %r2,6cb9de
      [    0.597441] Call Trace:
      [    0.597511] ([<00000000004ab3a2>] hwsampler_setup+0x262/0x7b8)
      [    0.597676]  [<0000000000875812>] oprofile_arch_init+0x32/0xd0
      [    0.597834]  [<0000000000875788>] oprofile_init+0x28/0x74
      [    0.597991]  [<00000000001001be>] do_one_initcall+0x3a/0x170
      [    0.598151]  [<000000000084fa22>] kernel_init+0x142/0x1ec
      [    0.598314]  [<000000000057db16>] kernel_thread_starter+0x6/0xc
      [    0.598468]  [<000000000057db10>] kernel_thread_starter+0x0/0xc
      [    0.598606] Last Breaking-Event-Address:
      [    0.598707]  [<00000000004ab896>] hwsampler_setup+0x756/0x7b8
      [    0.598863] ---[ end trace ce3179037f4e3e5b ]---
      
      So lets also mask the 2nd double word. Facilites 66,76,76,77 should be fine.
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      9950f8be
    • Christian Borntraeger's avatar
      [S390] kvm-s390: Fix host crash on misbehaving guests · a578b37c
      Christian Borntraeger authored
      commit 9ff4cfb3 ([S390] kvm-390: Let
      kernel exit SIE instruction on work) fixed a problem of commit
      commit cd3b70f5
      
       ([S390] virtualization
      aware cpu measurement) but uncovered another one.
      
      If a kvm guest accesses guest real memory that doesnt exist, the
      page fault handler calls the sie hook, which then rewrites
      the return psw from sie_inst to either sie_exit or sie_reenter.
      On return, the page fault handler will then detect the wrong access
      as a kernel fault causing a kernel oops in sie_reenter or sie_exit.
      
      We have to add these two addresses to the exception  table to allow
      graceful exits.
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      a578b37c
    • Bruno Prémont's avatar
      video: Fix use-after-free by vga16fb on rmmod · a50d28de
      Bruno Prémont authored
      
      
      Since fb_info is now refcounted and thus may get freed at any time it
      gets unregistered module unloading will try to unregister framebuffer
      as stored in platform data on probe though this pointer may
      be stale.
      
      Cleanup platform data on framebuffer release.
      
      CC: stable@kernel.org
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      a50d28de