Permalink
Switch branches/tags
Commits on Jul 1, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds committed Jul 1, 2010
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: docs: add an entry for imx2_wdt
  2. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 1, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)
      drm/radeon/kms: remove rv100 bios connector quirk
      drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode
      DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)
      drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)
      drm/radeon: add quirk to make HP nx6125 laptop resume.
      drm/radeon/kms: add some missing regs to evergreen gpu init
      drm/radeon/kms: fix typos in evergreen command checker
      drm/radeon/kms: avoid oops on mac r4xx cards
      fb: fix colliding defines for fb flags.
      drm/radeon/kms: Force HDP_NONSURF to maximum size
      drm/radeon/kms: disable frac fb dividers for rs6xx
      drm/radeon/kms: don't read attempt to read bios from VRAM on unposted GPU.
      drm/radeon/kms: fix typo in evergreen_gpu_init
      drm/radeon/kms: return ret in cursor_set failure path
      drm/ttm: non pooled page allocation should have GFP_USER set
      drm/radeon/r100/r200: fix calculation of compressed cube maps
      drm/radeon/r200: handle more hw tex coord types
      drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx
      drm/radeon: add fake RN50 table for powerpc
      drm/fb: Fix video= mode computation
      ...
  3. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Jul 1, 2010
    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Fix spinaphore down_spin()
  4. watchdog: docs: add an entry for imx2_wdt

    Fabio Estevam Wim Van Sebroeck
    Fabio Estevam authored and Wim Van Sebroeck committed Jun 24, 2010
    Add an entry for imx2_wdt in watchdog-parameters.txt
    
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  5. drm/radeon/kms: remove rv100 bios connector quirk

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 30, 2010
    Some RV100 cards with 2 VGA ports show up with DVI+VGA, however
    some boards with DVI+VGA have the same subsystem ids. Better
    to have a VGA port show up as DVI than having a non-useable
    DVI port.
    
    reported by DHR in irc.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 25, 2010
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=28745
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Tested-by: Rafał Miłecki <zajec5@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. DRM / radeon / KMS: Fix hibernation regression related to radeon PM (…

    rjwysocki authored and Dave Airlie committed Jun 17, 2010
    …was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)
    
    There is a regression from 2.6.34 related to the recent radeon power
    management changes, caused by attempting to cancel a delayed work
    item that's never been scheduled.  However, the code as is has some
    other issues potentially leading to visible problems.
    
    First, the mutex around cancel_delayed_work() in radeon_pm_suspend()
    doesn't really serve any purpose, because cancel_delayed_work() only
    tries to delete the work's timer.  Moreover, it doesn't prevent the
    work handler from running, so the handler can do some wrong things if
    it wins the race and in that case it will rearm itself to do some
    more wrong things going forward.  So, I think it's better to wait for
    the handler to return in case it's already been queued up for
    execution.  Also, it should be prevented from rearming itself in that
    case.
    
    Second, in radeon_set_pm_method() the cancel_delayed_work() is not
    sufficient to prevent the work handler from running and queing up
    itself for the next run (the failure scenario is that
    cancel_delayed_work() returns 0, so the handler is run, it waits on
    the mutex and then rearms itself after the mutex has been released),
    so again the work handler should be prevented from rearming itself in
    that case..
    
    Finally, there's a potential deadlock in radeon_pm_fini(), because
    cancel_delayed_work_sync() is called under rdev->pm.mutex, but the
    work handler tries to acquire the same mutex (if it wins the race).
    
    Fix the issues described above.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  8. drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 30, 2010
    Some IGP systems specify the system memory clock in the Firmware
    table rather than the IGP info table.  Check both and make sure
    we have a value system memory clock value.
    
    v2: make sure rs690_pm_info is called on rs780/rs880 as well.
    
    fixes a regression since 07d4190.
    
    Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. drm/radeon: add quirk to make HP nx6125 laptop resume.

    Dave Airlie
    Dave Airlie committed Jun 30, 2010
    For some reason on resume, executing the BIOS scripts locks up the whole chipset, by avoiding the dynclk table the machine resumes properly and seems to function okay.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  10. drm/radeon/kms: add some missing regs to evergreen gpu init

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 29, 2010
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  11. drm/radeon/kms: fix typos in evergreen command checker

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 23, 2010
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. drm/radeon/kms: avoid oops on mac r4xx cards

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 23, 2010
    They don't have an atombios so don't attempt to use it for
    eng/mem clocks.
    
    Reported by spoonb on #radeon
    fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=28671
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. fb: fix colliding defines for fb flags.

    Dave Airlie
    Dave Airlie committed Jun 23, 2010
    When I added the flags I must have been using a 25 line terminal and missed the following flags.
    
    The collided with flag has one user in staging despite being in-tree for 5 years.
    
    I'm happy to push this via my drm tree unless someone really wants to do it.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Cc: stable@kernel.org
  14. drm/radeon/kms: Force HDP_NONSURF to maximum size

    Jerome Glisse Dave Airlie
    Jerome Glisse authored and Dave Airlie committed Jun 3, 2010
    HDP non surface should cover the whole VRAM but we were misscomputing
    the size and we endup in some case not covering the VRAM at all (if
    VRAM size were > 1G). Covering more than the VRAM size shouldn't be
    an issue.
    
    Fix : https://bugs.freedesktop.org/show_bug.cgi?id=28016
    
    [airlied: add evergreen fix]
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  15. drm/radeon/kms: disable frac fb dividers for rs6xx

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 8, 2010
    Should fix fdo bug 28331:
    https://bugs.freedesktop.org/show_bug.cgi?id=28331
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  16. drm/radeon/kms: don't read attempt to read bios from VRAM on unposted…

    Dave Airlie
    Dave Airlie committed Jun 21, 2010
    … GPU.
    
    Since the VGA switcheroo, we'd attempt to read the BIOS from VRAM on startup
    but on some unposted cards this can cause hangs/crashes.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=28592
    
    (further problem pointed out by agd5f on IGP systems)
    
    Reported-by: Reilithion on #radeon
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  17. drm/radeon/kms: fix typo in evergreen_gpu_init

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 16, 2010
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  18. drm/radeon/kms: return ret in cursor_set failure path

    mattst88 authored and Dave Airlie committed Jun 19, 2010
    We were returning 0 in both the success and failure paths. Noticed while
    investigating FDO bug 26403.
    
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  19. drm/ttm: non pooled page allocation should have GFP_USER set

    Jerome Glisse Dave Airlie
    Jerome Glisse authored and Dave Airlie committed Jun 16, 2010
    Non pooled page allocation should have GFP_USER set so allocation
    can wait and reclaim page from other process (ie non atomic).
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  20. drm/radeon/r100/r200: fix calculation of compressed cube maps

    Roland Scheidegger Dave Airlie
    Roland Scheidegger authored and Dave Airlie committed Jun 12, 2010
    This needs similar handling to other compressed textures.
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=26428
    
    Signed-off-by: sroland@vmware.com
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  21. drm/radeon/r200: handle more hw tex coord types

    Roland Scheidegger Dave Airlie
    Roland Scheidegger authored and Dave Airlie committed Jun 12, 2010
    Code did not handle projected 2d and depth coordinates, meaning potentially
    set 3d or cube special handling might stick.
    (Not sure what depth coord actually does, but I guess handling it
    like a normal coordinate is the right thing to do.)
    Might be related to https://bugs.freedesktop.org/show_bug.cgi?id=26428
    
    Signed-off-by: sroland@vmware.com
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  22. drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx

    Roland Scheidegger Dave Airlie
    Roland Scheidegger authored and Dave Airlie committed Jun 12, 2010
    fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=28459
    
    agd5f: apply to r1xx/r2xx as well.
    
    Signed-off-by: Roland Scheidegger <sroland@vmware.com>
    Cc: stable@kernel.org
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  23. drm/radeon: add fake RN50 table for powerpc

    Dave Airlie
    Dave Airlie committed Jun 11, 2010
    This works well enough on a js21, but it would be nice if IBM could supply
    more tables for the later Power6/7 machines.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  24. drm/fb: Fix video= mode computation

    nwnk authored and Dave Airlie committed Jun 10, 2010
    Reduced blanking is valid only when doing CVT modes.  Also, generate GTF
    modes unless CVT was requested; CVT devices are required to support GTF,
    but the reverse is not true.
    
    [airlied: fix typo]
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  25. drm/radeon/kms: fix DP after DPMS cycle

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 10, 2010
    The transmitter needs to be enabled before the link is trained.
    
    Reported-By: Lars Doelle <lars.doelle@on-line.de>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  26. drm/radeon/kms: fix dpms state on resume

    Gritche authored and Dave Airlie committed Jun 11, 2010
    When suspending, we turn the display hw off, at resume the screen will stay black.
    This patch turn it on. Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=16180
    
    Signed-off-by: Cedric Godin <cedric.godin@skynet.be>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  27. drm/radeon/kms: fix bandwidth calculation when sideport is present

    Alex Deucher Dave Airlie
    Alex Deucher authored and Dave Airlie committed Jun 12, 2010
    Fixes fdo bug 27529:
    https://bugs.freedesktop.org/show_bug.cgi?id=27529
    
    Reported-by: steckdenis@yahoo.fr
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Jun 30, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

    torvalds committed Jun 30, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
      Staging: rtl8192u_usb: Add LG device ID 043e:7a01
      Staging: rtl8192s_usb: Remove duplicate device ID
      Staging: rt2870: add device id for Zyxel NWD-270N
      Staging: comedi: fix read past end of array in cb_pcidda_attach()
      Staging: rtl8192su: add device ids
      Staging: rtl8192su: remove device ids
      Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2
      Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set
      Staging: wlags49_h2: add missing <linux/string.h> for strlen
      Staging: hv: fix hv_utils module to properly autoload
      staging: hv: Fix race condition on vmbus channel initialization
      Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case
      Staging: mrst-touchscreen: fix dereferencing free memory
      Staging: batman-adv: fix function prototype
      Staging: batman-adv: return -EFAULT on copy_to_user errors
      staging: usbip: usbip_common: kill rx thread on tx thread creation error.
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds committed Jun 30, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
      USB: gadget: f_mass_storage: stale common->fsg value bug fix
      USB: gadget: f_mass_storage: fixed fs descriptors not being updated
      USB: musb: Enable the maximum supported burst mode for DMA
      USB: musb: fix Blackfin ulpi stubs
      USB: MUSB: make non-OMAP platforms build with CONFIG_PM=y
      USB: musb_core: make disconnect and suspend interrupts work again
      USB: obey the sysfs power/wakeup setting
      USB: gadget eth: Fix calculate CRC32 in EEM
      USB: qcserial: fix a memory leak in qcprobe error path
      USB: gadget/printer, fix sleep inside atomic
      USB: isp1362-hcd, fix double lock
      USB: serial: ftdi: correct merge conflict with CONTEC id
      USB: fix oops in usb_sg_init()
      USB: s3c2410: deactivate endpoints before gadget unbinding
      USB: ehci-mxc: bail out on transceiver problems
      USB: otg/ulpi: bail out on read errors
      usb: musb: Fix a bug by making suspend interrupt available in device mode
      USB: r8a66597: Fix failure in change of status
      USB: xHCI: Fix bug in link TRB activation change.
      USB: gadget: g_fs: possible invalid pointer reference bug fixed
      ...
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    torvalds committed Jun 30, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: cpm_uart: implement the cpm_uart_early_write() function for console poll
  4. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Jun 30, 2010
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP: hwmod: Fix the missing braces
      OMAP4: clock: Fix multi-omap boot with reset un-used clocks
      OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
      omap: GPIO: fix auto-disable of debounce clock
      omap: DMTIMER: Ack pending interrupt always when stopping a timer
      omap: Stalker board: switch over to gpio_set_debounce
      omap: fix build failure due to missing include dma-mapping.h
      omap iommu: Fix Memory leak
  5. Add mdr as maintainer of qla1280 driver.

    Jes Sorensen authored and torvalds committed Jun 30, 2010
    As discussed with Mike Reed, add him as the maintainer of the qla1280
    driver as I no longer have any hardware and he is actively looking
    after it.
    
    Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. futex: futex_find_get_task remove credentails check

    Michal Hocko authored and torvalds committed Jun 30, 2010
    futex_find_get_task is currently used (through lookup_pi_state) from two
    contexts, futex_requeue and futex_lock_pi_atomic.  None of the paths
    looks it needs the credentials check, though.  Different (e)uids
    shouldn't matter at all because the only thing that is important for
    shared futex is the accessibility of the shared memory.
    
    The credentail check results in glibc assert failure or process hang (if
    glibc is compiled without assert support) for shared robust pthread
    mutex with priority inheritance if a process tries to lock already held
    lock owned by a process with a different euid:
    
    pthread_mutex_lock.c:312: __pthread_mutex_lock_full: Assertion `(-(e)) != 3 || !robust' failed.
    
    The problem is that futex_lock_pi_atomic which is called when we try to
    lock already held lock checks the current holder (tid is stored in the
    futex value) to get the PI state.  It uses lookup_pi_state which in turn
    gets task struct from futex_find_get_task.  ESRCH is returned either
    when the task is not found or if credentials check fails.
    
    futex_lock_pi_atomic simply returns if it gets ESRCH.  glibc code,
    however, doesn't expect that robust lock returns with ESRCH because it
    should get either success or owner died.
    
    Signed-off-by: Michal Hocko <mhocko@suse.cz>
    Acked-by: Darren Hart <dvhltc@us.ibm.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. [IA64] Fix spinaphore down_spin()

    Tony Luck
    Tony Luck committed Jun 30, 2010
    Typo in down_spin() meant it only read the low 32 bits of the
    "serve" value, instead of the full 64 bits. This results in the
    system hanging when the values in ticket/serve get larger than
    32-bits. A big enough system running the right test can hit this
    in a just a few hours.
    
    Broken since 883a3ac
        [IA64] Re-implement spinaphores using ticket lock concepts
    
    Reported via IRC by Bjorn Helgaas
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  8. Staging: rtl8192u_usb: Add LG device ID 043e:7a01

    bwhacks authored and gregkh committed Jun 25, 2010
    Add another device ID as listed in the vendor driver version
    0003.0825.2009.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>