1. 13 2月, 2010 8 次提交
  2. 12 2月, 2010 26 次提交
  3. 11 2月, 2010 6 次提交
    • A
      vgaarb: fix incorrect dereference of userspace pointer. · 77c1ff39
      Andy Getzendanner 提交于
      This patch corrects a userspace pointer dereference in the VGA arbiter
      in 2.6.32.1.
      
      copy_from_user() is used at line 822 to copy the contents of buf into
      kbuf, but a call to strncmp() on line 964 uses buf rather than kbuf.  This
      problem led to a GPF in strncmp() when X was started on my x86_32 systems.
       X triggered the behavior with a write of "target PCI:0000:01:00.0" to
      /dev/vga_arbiter.
      
      The patch has been tested against 2.6.32.1 and observed to correct the GPF
      observed when starting X or manually writing the string "target
      PCI:0000:01:00.0" to /dev/vga_arbiter.
      Signed-off-by: NAndy Getzendanner <james.getzendanner@students.olin.edu>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Cc: <stable@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      77c1ff39
    • D
      Merge branch 'drm-radeon-linus' of ../drm-next · 0a4583eb
      Dave Airlie 提交于
      * 'drm-radeon-linus' of ../drm-next:
        drm/radeon/kms: retry auxch on 0x20 timeout value.
        drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.
        drm/radeon/kms: fix screen clearing before fbcon.
        drm/radeon/kms: add quirk for VGA without DDC on rv730 XFX card.
        drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector.
        drm/radeon/kms: change Kconfig text to reflect the new option.
        drm/radeon/kms: suspend and resume audio stuff
      0a4583eb
    • D
      drm/radeon/kms: retry auxch on 0x20 timeout value. · 648ac05c
      Dave Airlie 提交于
      ATOM appears to return 0x20 which seems to mean some sort of timeout.
      
      retry the transaction up to 10 times before failing, this
      makes DP->VGA convertor we bought work at least a bit more predictably.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      648ac05c
    • P
      drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine. · c60a284c
      Pauli Nieminen 提交于
      radeon_copy_dma is only available for r200 or newer cards.
      Call to radeon_copy_dma would result to NULL pointer
      dereference if benchmarking asic without dma engine.
      Signed-off-by: NPauli Nieminen <suokkos@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c60a284c
    • D
      Merge remote branch 'nouveau/for-airlied' of nouveau-2.6 · e8a47c10
      Dave Airlie 提交于
      * 'nouveau/for-airlied' of /home/airlied/kernel/drm-next:
        nouveau: fix state detection with switchable graphics
        drm/nouveau: move dereferences after null checks
        drm/nv50: make the pgraph irq handler loop like the pre-nv50 version
        drm/nv50: delete ramfc object after disabling fifo, not before
        drm/nv50: avoid unloading pgraph context when ctxprog is running
        drm/nv50: align size of buffer object to the right boundaries.
        drm/nv50: disregard dac outputs in nv50_sor_dpms()
        drm/nv50: prevent multiple init tables being parsed at the same time
        drm/nouveau: make dp auxch xfer len check for reads only
        drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50
        drm/nouveau: Add proper vgaarb support.
        drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.
        drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test
        drm/nouveau: call ttm_bo_wait with the bo lock held to prevent hang
        drm/nouveau: Fixup semaphores on pre-nv50 cards.
        drm/nouveau: Add getparam to get available PGRAPH units.
        drm/nouveau: Add module options to disable acceleration.
        drm/nouveau: fix non-vram notifier blocks
      e8a47c10
    • T
      85b9e487