1. 02 8月, 2010 15 次提交
  2. 21 7月, 2010 3 次提交
    • A
      drm/radeon/kms/atom: add crtc disable function · 37f9003b
      Alex Deucher 提交于
      Disables the crts as per dpms and also disables the ppll
      associated with the crtc.  This should save additional power.
      Signed-off-by: NAlex Deucher <alexdeucher@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      37f9003b
    • C
      drm: Return EBUSY if the framebuffer is unbound when flipping. · 90c1efdd
      Chris Wilson 提交于
      It looks like there is a race condition between unbinding a framebuffer
      on a hotplug event and user space trying to flip:
      
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000058
      IP: [<ffffffffa008c7d3>] intel_crtc_page_flip+0xc9/0x39c [i915]
      PGD 114724067 PUD 1145bd067 PMD 0
      Oops: 0000 [#1] SMP
      Pid: 10954, comm: X Not tainted 2.6.35-rc5_stable_20100714+ #1
      P5Q-EM/P5Q-EM
      RIP: 0010:[<ffffffffa008c7d3>]  [<ffffffffa008c7d3>]
      intel_crtc_page_flip+0xc9/0x39c [i915]
      RSP: 0018:ffff880114927cc8  EFLAGS: 00010282
      RAX: 0000000000000000 RBX: ffff88012df48320 RCX: ffff88010c945600
      RDX: ffff880001a109c8 RSI: ffff88010c945840 RDI: ffff88012df48320
      RBP: ffff880114927d18 R08: ffff88012df48280 R09: ffff88012df48320
      R10: 0000000003c2e0b0 R11: 0000000000003246 R12: ffff88010c945840
      R13: ffff88012df48000 R14: 0000000000000060 R15: ffff88012dbb8000
      FS:  00007f9e6078e830(0000) GS:ffff880001a00000(0000)
      knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 0000000000000058 CR3: 00000001177a8000 CR4: 00000000000406f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Process X (pid: 10954, threadinfo ffff880114926000, task
      ffff88012a4a1690)
      Stack:
       ffff88010c945600 ffff880115b176c0 ffff88012db10000 0000000000000246
      <0> fffffff40006101c ffff88010c945600 00000000ffffffea ffff88010c945600
      <0> ffff88012df48320 ffff88011b4b6780 ffff880114927d78 ffffffffa003bd0e
      Call Trace:
       [<ffffffffa003bd0e>] drm_mode_page_flip_ioctl+0x1bc/0x214 [drm]
       [<ffffffffa00311fc>] drm_ioctl+0x25e/0x35e [drm]
       [<ffffffffa003bb52>] ? drm_mode_page_flip_ioctl+0x0/0x214 [drm]
       [<ffffffff810f1c3c>] vfs_ioctl+0x2a/0x9e
       [<ffffffff810f227e>] do_vfs_ioctl+0x531/0x565
       [<ffffffff810f2307>] sys_ioctl+0x55/0x77
       [<ffffffff810e56d6>] ? sys_read+0x47/0x6f
       [<ffffffff81002a2b>] system_call_fastpath+0x16/0x1b
      Code: 45 d4 f4 ff ff ff 0f 84 e0 02 00 00 48 8b 4d b0 49 8d 9d 20 03 00 00 48
      89 df 49 89 4c 24 38 49 8b 07 49 89 44 24 20 49 8b 47 20 <48> 8b 40 58 49 c7 04
      24 00 00 00 00 49 c7 44 24 18 a9 a5 08 a0
      RIP  [<ffffffffa008c7d3>] intel_crtc_page_flip+0xc9/0x39c [i915]
       RSP <ffff880114927cc8>
      CR2: 0000000000000058
      
      References:
      
        Bug 28811 - [page-flipping] GPU hang when modeset after unplugging
                    another monitor (under compiz)
        https://bugs.freedesktop.org/show_bug.cgi?id=28811Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      90c1efdd
    • B
      drm: add "auto" dithering method · 92897b5c
      Ben Skeggs 提交于
      There's no convenient/reliable way for drivers to both obey the dithering
      mode property, and to be able to attempt to provide a good default in all
      cases.
      
      This commit adds an "auto" method to the property which drivers can default
      to if they wish, whilst still allowing the user to override the choice as
      they do now.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      92897b5c
  3. 16 7月, 2010 1 次提交
  4. 13 7月, 2010 1 次提交
  5. 09 7月, 2010 1 次提交
  6. 07 7月, 2010 14 次提交
  7. 05 7月, 2010 5 次提交
    • L
      Linux 2.6.35-rc4 · 815c4163
      Linus Torvalds 提交于
      815c4163
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 71665963
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6205/1: perf: ensure counter delta is treated as unsigned
        ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220
        ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220
        ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU
        ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore
        ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section
        ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section
        ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround
        ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP
        ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds
        ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI
        [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA
        [ARM] pxa/mioa701: fix camera regression
        [ARM] pxa/z2: fix flash layout to final version
        [ARM] pxa/z2: fix missing include in battery driver
        [ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h
      71665963
    • L
      Merge branch 'perf-fixes-for-linus' of... · 3f7d7b4b
      Linus Torvalds 提交于
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf, x86: Fix incorrect branches event on AMD CPUs
        perf tools: Fix find tids routine by excluding "." and ".."
        x86: Send a SIGTRAP for user icebp traps
      3f7d7b4b
    • Y
      module: initialize module dynamic debug later · ff49d74a
      Yehuda Sadeh 提交于
      We should initialize the module dynamic debug datastructures
      only after determining that the module is not loaded yet. This
      fixes a bug that introduced in 2.6.35-rc2, where when a trying
      to load a module twice, we also load it's dynamic printing data
      twice which causes all sorts of nasty issues. Also handle
      the dynamic debug cleanup later on failure.
      Signed-off-by: NYehuda Sadeh <yehuda@hq.newdream.net>
      Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (removed a #ifdef)
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ff49d74a
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · e3668dd8
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: remove block number from inode lookup code
        xfs: rename XFS_IGET_BULKSTAT to XFS_IGET_UNTRUSTED
        xfs: validate untrusted inode numbers during lookup
        xfs: always use iget in bulkstat
        xfs: prevent swapext from operating on write-only files
      e3668dd8