Permalink
Commits on Jul 2, 2010
  1. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Cure nr_iowait_cpu() users
      init: Fix comment
      init, sched: Fix race between init and kthreadd
    torvalds committed Jul 2, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Fix syndrome calculation on K8
    torvalds committed Jul 2, 2010
  3. amd64_edac: Fix syndrome calculation on K8

    When calculating the DCT channel from the syndrome we need to know the
    syndrome type (x4 vs x8). On F10h, this is read out from extended PCI
    cfg space register F3x180 while on K8 we only support x4 syndromes and
    don't have extended PCI config space anyway.
    
    Make the code accessing F3x180 F10h only and fall back to x4 syndromes
    on everything else.
    
    Cc: <stable@kernel.org> # .33.x .34.x
    Reported-by: Jeffrey Merkey <jeffmerkey@gmail.com>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Jul 2, 2010
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: fix page flip finish vs. prepare on plane B
      drm/i915: change default panel fitting mode to preserve aspect ratio
      drm/i915: fix uninitialized variable warning in i915_setup_compression()
      drm/i915: take struct_mutex in i915_dma_cleanup()
      drm/i915: Fix CRT hotplug regression in 2.6.35-rc1
      i915: fix ironlake edp panel setup (v4)
      drm/i915: don't access FW_BLC_SELF on 965G
      drm/i915: Account for space on the ring buffer consumed whilst wrapping.
      drm/i915: gen3 page flipping fixes
      drm/i915: don't queue flips during a flip pending event
      drm/i915: Fix incorrect intel_ring_begin size in BSD ringbuffer.
      drm/i915: Turn on 945 self-refresh only if single CRTC is active
      drm/i915/gen4: Fix interrupt setup ordering
      drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.
      drm/i915: Move non-phys cursors into the GTT
      Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."
    
    (Included the "fix page flip finish vs.  prepare on plane B" patch from
    Jesse on top of the pull request from Eric.   -- Linus)
    torvalds committed Jul 2, 2010
  5. drm/i915: fix page flip finish vs. prepare on plane B

    The refreshed patch had a copy & paste bug.
    
    Reported-by: Simon Farnsworth <simon.farnsworth@onelan.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jesse Barnes committed with torvalds Jul 1, 2010
  6. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1
      ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
      libahci: Fix bug in storing EM messages
    torvalds committed Jul 2, 2010
  7. correct console log level when ERST ACPI table is not found

    When booting 2.6.35-rc3 on a x86 system without an ERST ACPI table with
    the 'quiet' option, we still observe an "ERST: Table is not found!"
    warning.
    
    Quiesce it to the same info log level as the other 'table not found'
    warnings.
    
    Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Daniel J Blueman committed with torvalds Jul 1, 2010
  8. drm/i915: fix hibernation since i915 self-reclaim fixes

    Since commit 4bdadb9 ("drm/i915:
    Selectively enable self-reclaim"), we've been passing GFP_MOVABLE to the
    i915 page allocator where we weren't before due to some over-eager
    removal of the page mapping gfp_flags games the code used to play.
    
    This caused hibernate on Intel hardware to result in a lot of memory
    corruptions on resume.  See for example
    
      http://bugzilla.kernel.org/show_bug.cgi?id=13811
    
    Reported-by: Evengi Golov (in bugzilla)
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Tested-by: M. Vefa Bicakci <bicave@superonline.com>
    Cc: stable@kernel.org
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Jul 2, 2010
Commits on Jul 1, 2010
  1. drm/i915: change default panel fitting mode to preserve aspect ratio

    We did this a long time ago in the DDX driver, but now this fix belongs
    in the kernel.
    
    Preserving the aspect ratio is a nicer default.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18033.
    
    Tested-by: Josh Triplett <josh@freedesktop.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    jbarnes993 committed with anholt Jun 24, 2010
  2. drm/i915: fix uninitialized variable warning in i915_setup_compression()

    Fixes:
    
    drivers/gpu/drm/i915/i915_dma.c: In function ‘i915_setup_compression’:
    drivers/gpu/drm/i915/i915_dma.c:1311: error: ‘compressed_llb’ may be used uninitialized in this function
    
    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    prarit committed with anholt May 27, 2010
  3. drm/i915: take struct_mutex in i915_dma_cleanup()

    intel_cleanup_ring_buffer() calls drm_gem_object_unreference() (as
    opposed to drm_gem_object_unreference_unlocked()) so it needs to be
    called with "struct_mutex" held.  If we don't hold the lock, it triggers
    a BUG_ON(!mutex_is_locked(&dev->struct_mutex));
    
    I also audited the other places that call intel_cleanup_ring_buffer()
    and they all hold the lock so they're OK.
    
    This was introduced in: 8187a2b "drm/i915: introduce
    intel_ring_buffer structure (V2)" and it's a regression from v2.6.34.
    
    Addresses: https://bugzilla.kernel.org/show_bug.cgi?id=16247
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Reported-by: Benny Halevy <bhalevy@panasas.com>
    Tested-by: Benny Halevy <bhalevy@panasas.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    error27 committed with anholt Jun 23, 2010
  4. drm/i915: Fix CRT hotplug regression in 2.6.35-rc1

    Commit 7a772c4 has two bugs which
    made the hotplug problems on my laptop worse instead of better.
    
    First, it did not, in fact, disable the CRT plug interrupt -- it
    disabled all the other hotplug interrupts.  It seems rather doubtful
    that that bit of the patch fixed anything, so let's just remove it.
    (If you want to add it back, you probably meant ~CRT_HOTPLUG_INT_EN.)
    
    Second, on at least my GM45, setting CRT_HOTPLUG_ACTIVATION_PERIOD_64
    and CRT_HOTPLUG_VOLTAGE_COMPARE_50 (when they were previously unset)
    causes a hotplug interrupt about three seconds later.  The old code
    never restored PORT_HOTPLUG_EN so this could only happen once, but
    they new code restores those registers.  So just set those bits when
    we set up the interrupt in the first place.
    
    Signed-off-by: Andy Lutomirski <luto@mit.edu>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    amluto committed with anholt Jun 12, 2010
  5. i915: fix ironlake edp panel setup (v4)

    The eDP spec claims a 20% overhead for the 8:10 encoding scheme used
    on the wire. Take this into account when picking the lane/clock speed
    for the panel.
    
    v3: some panels are out of spec, try our best to deal with them, don't
    refuse modes on eDP panels, and try the largest allowed settings if
    all else fails on eDP.
    v4: fix stupid typo, forgot to git add before amending.
    
    Fixes several reports in bugzilla:
    
          https://bugs.freedesktop.org/show_bug.cgi?id=28070
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Dave Airlie committed with anholt Jun 30, 2010
  6. drm/i915: don't access FW_BLC_SELF on 965G

    The register offset for FW_BLC_SELF is a totally different set of bits
    on Broadwater (it's actually MI_RDRET_STATE), so don't treat it like
    FW_BLC_SELF on 965G chips.
    
    Fixes bug https://bugs.freedesktop.org/show_bug.cgi?id=26874.
    
    Cc: stable@kernel.org
    Tested-by: Norman Yarvin <yarvin@yarchive.net>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    jbarnes993 committed with anholt Jun 30, 2010
  7. drm/i915: Account for space on the ring buffer consumed whilst wrapping.

    If we fill the tail of the physical ring buffer with NOOP when wrapping,
    we need to account for the reduction in available space.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    ickle committed with anholt Jul 1, 2010
  8. ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1

    IDE mode of MCP89 on MBP 7,1 doesn't set DMA enable bits in the BMDMA
    status register.  Make the following changes to work around the problem.
    
    * Instead of using hard coded 1 in id->driver_data as class code
      match, use ATA_GEN_CLASS_MATCH and carry the matched id in
      host->private_data.
    
    * Instead of matching PCI_VENDOR_ID_CENATEK, use ATA_GEN_FORCE_DMA
      flag in id instead.
    
    * Add ATA_GEN_FORCE_DMA to the id entry of MBP 7,1.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Peer Chen <pchen@nvidia.com>
    Cc: stable@kernel.org
    Reported-by: Anders Østhus <grapz666@gmail.com>
    Reported-by: Andreas Graf <andreas_graf@csgraf.de>
    Reported-by: Benoit Gschwind <gschwind@gnu-log.net>
    Reported-by: Damien Cassou <damien.cassou@gmail.com>
    Reported-by: tixetsal@juno.com
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    htejun committed with Jeff Garzik Jun 22, 2010
  9. ahci,ata_generic: let ata_generic handle new MBP w/ MCP89

    For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
    linux but the controller doesn't require explicit mode setting and
    works fine with ata_generic.  Make ahci ignore the controller on MBP
    7,1 and let ata_generic take it for now.
    
    Reported in bko#15923.
    
      https://bugzilla.kernel.org/show_bug.cgi?id=15923
    
    NVIDIA is investigating why ahci mode doesn't work.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Peer Chen <pchen@nvidia.com>
    Cc: stable@kernel.org
    Reported-by: Anders Østhus <grapz666@gmail.com>
    Reported-by: Andreas Graf <andreas_graf@csgraf.de>
    Reported-by: Benoit Gschwind <gschwind@gnu-log.net>
    Reported-by: Damien Cassou <damien.cassou@gmail.com>
    Reported-by: tixetsal@juno.com
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    htejun committed with Jeff Garzik Jun 17, 2010
  10. libahci: Fix bug in storing EM messages

    In function ahci_store_em_buffer(), if the input (signed char*) buffer
    contains negative data, the constructed 32-bit long message data may
    be wrong.
    
    Signed-off-by: Harry Zhang <harry.zhang@amd.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Harry Zhang committed with Jeff Garzik Jun 24, 2010
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

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

    …/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
      ...
    torvalds committed Jul 1, 2010
  13. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …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()
    torvalds committed Jul 1, 2010
  14. watchdog: docs: add an entry for imx2_wdt

    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>
    Fabio Estevam committed with Wim Van Sebroeck Jun 24, 2010
  15. sched: Cure nr_iowait_cpu() users

    Commit 0224cf4 (sched: Intoduce get_cpu_iowait_time_us())
    broke things by not making sure preemption was indeed disabled
    by the callers of nr_iowait_cpu() which took the iowait value of
    the current cpu.
    
    This resulted in a heap of preempt warnings. Cure this by making
    nr_iowait_cpu() take a cpu number and fix up the callers to pass
    in the right number.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Maxim Levitsky <maximlevitsky@gmail.com>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Pavel Machek <pavel@ucw.cz>
    Cc: Jiri Slaby <jslaby@suse.cz>
    Cc: linux-pm@lists.linux-foundation.org
    LKML-Reference: <1277968037.1868.120.camel@laptop>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Peter Zijlstra committed with Ingo Molnar Jul 1, 2010
  16. drm/radeon/kms: remove rv100 bios connector quirk

    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>
    Alex Deucher committed with Dave Airlie Jun 30, 2010
  17. drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode

    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>
    Alex Deucher committed with Dave Airlie Jun 25, 2010
  18. 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)
    
    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>
    rjwysocki committed with Dave Airlie Jun 17, 2010
  19. drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)

    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>
    Alex Deucher committed with Dave Airlie Jun 30, 2010
  20. drm/radeon: add quirk to make HP nx6125 laptop resume.

    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>
    Dave Airlie committed Jun 30, 2010
  21. drm/radeon/kms: add some missing regs to evergreen gpu init

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

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

    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>
    Alex Deucher committed with Dave Airlie Jun 23, 2010
  24. fb: fix colliding defines for fb flags.

    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
    Dave Airlie committed Jun 23, 2010
  25. drm/radeon/kms: Force HDP_NONSURF to maximum size

    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>
    Jerome Glisse committed with Dave Airlie Jun 3, 2010
  26. drm/radeon/kms: disable frac fb dividers for rs6xx

    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>
    Alex Deucher committed with Dave Airlie Jun 8, 2010
  27. drm/radeon/kms: don't read attempt to read bios from VRAM on unposted…

    … 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>
    Dave Airlie committed Jun 21, 2010