1. 27 7月, 2011 5 次提交
    • A
      watchdog: Add Xilinx watchdog timer driver · e9659e69
      Alejandro Cabrera 提交于
      Watchdog timer device driver for Xilinx xps_timebase_wdt compatible ip cores.
      It takes watchdog timer configuration from device tree and it needs that its
      parent has defined the property "clock-frecuency".
      It is compatible with watchdog timer kernel API, so user apps like watchdogd
      may talk with it.
      Signed-off-by: NAlejandro Cabrera <aldaya@gmail.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      e9659e69
    • W
      watchdog: remove empty pm-functions · 2fc5d52b
      Wolfram Sang 提交于
      While checking what watchdog drivers usually do in suspend/resume to
      spot common behaviour for the watchdog framework, I found these drivers
      which do nothing but add some cruft. Remove it, it is superfluous. New
      approaches should probably be done with pm_ops anyway.
      Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      2fc5d52b
    • N
      watchdog: sp805: Flush posted writes in enable/disable. · 081d83a3
      Nick Bowler 提交于
      There are no reads in these functions, so if MMIO writes are posted,
      the writes in enable/disable may not have completed by the time these
      functions return.  If the functions run from different CPUs, it's
      in theory possible for the writes to be interleaved, which would be
      disastrous for this driver.
      
      At the very least, we need an mmiowb() before releasing the lock, but
      since it seems desirable for the watchdog timer to be actually stopped
      or reset when these functions return, read the lock register to force
      the writes out.
      Signed-off-by: NNick Bowler <nbowler@elliptictech.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      081d83a3
    • N
      watchdog: sp805: Don't write 0 to the load value register. · da3e5150
      Nick Bowler 提交于
      At least on the Versatile Express' V2M, calling wdt_disable followed by
      wdt_enable, for instance by running the following sequence:
      
        echo V > /dev/watchdog; echo V > /dev/watchdog
      
      results in an immediate reset.  The wdt_disable function writes 0 to the
      load register; while the watchdog interrupts are disabled at this point,
      this special value is defined to trigger an interrupt immediately.  It
      appears that in this instance, the reset happens when the interrupts
      are subsequently enabled by wdt_enable.
      
      Putting in a short delay after writing a new load value in wdt_enable
      solves the issue, but it seems cleaner to simply never write 0 to the
      load register at all: according to the hardware docs, writing 0 to the
      control register suffices to stop the counter, and the write of 0 to
      the load register is questionable anyway since this register resets to
      0xffffffff.
      Signed-off-by: NNick Bowler <nbowler@elliptictech.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      da3e5150
    • S
      watchdog: imx2_wdt: add device tree probe support · f5a427ee
      Shawn Guo 提交于
      Adds device tree probe support for imx2_wdt driver.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Wolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      f5a427ee
  2. 22 7月, 2011 8 次提交
  3. 19 7月, 2011 4 次提交
  4. 18 7月, 2011 3 次提交
  5. 17 7月, 2011 1 次提交
    • R
      watchdog: hpwdt depends on PCI · f71d26bb
      Randy Dunlap 提交于
      hpwdt is a PCI driver so it should depend on PCI.
      Fixes these build errors:
      
      drivers/watchdog/hpwdt.c:762: error: implicit declaration of function 'pci_iomap'
      drivers/watchdog/hpwdt.c:762: warning: assignment makes pointer from integer without a cast
      drivers/watchdog/hpwdt.c:797: error: implicit declaration of function 'pci_iounmap'
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Cc: Thomas Mingarelli <thomas.mingarelli@hp.com>
      f71d26bb
  6. 16 7月, 2011 3 次提交
  7. 15 7月, 2011 3 次提交
  8. 14 7月, 2011 7 次提交
  9. 13 7月, 2011 4 次提交
    • A
      drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits · c61d0af9
      Alex Deucher 提交于
      Compute drivers may change this, so make sure to emit it to
      avoid errors in bo blits.
      
      Fixes:
      https://bugs.freedesktop.org/show_bug.cgi?id=39119Signed-off-by: NAlex Deucher <alexdeucher@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c61d0af9
    • C
      agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M · 780d7cc4
      Chris Wilson 提交于
      Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
      relative to the GMCH specs, and confirmed that indeed one of his users
      with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: Konstantin Belousov <kostikbel@gmail.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      780d7cc4
    • R
      [media] MEDIA: Fix non-ISA_DMA_API link failure of sound code · 4756fc64
      Ralf Baechle 提交于
      sound/isa/es18xx.c: In function ‘snd_es18xx_playback1_prepare’:
      sound/isa/es18xx.c:501:9: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/es18xx.c: In function ‘snd_es18xx_playback_pointer’:
      sound/isa/es18xx.c:818:3: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[2]: *** [sound/isa/es18xx.o] Error 1
      sound/isa/sscape.c: In function ‘upload_dma_data’:
      sound/isa/sscape.c:481:3: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[2]: *** [sound/isa/sscape.o] Error 1
      sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_playback_prepare’:
      sound/isa/ad1816a/ad1816a_lib.c:244:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_playback_pointer’:
      sound/isa/ad1816a/ad1816a_lib.c:302:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_free’:
      sound/isa/ad1816a/ad1816a_lib.c:544:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/ad1816a/ad1816a_lib.o] Error 1
      make[3]: Target `__build' not remade because of errors.
      make[2]: *** [sound/isa/ad1816a] Error 2
      sound/isa/es1688/es1688_lib.c: In function ‘snd_es1688_playback_prepare’:
      sound/isa/es1688/es1688_lib.c:417:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/es1688/es1688_lib.c: In function ‘snd_es1688_playback_pointer’:
      sound/isa/es1688/es1688_lib.c:509:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/es1688/es1688_lib.o] Error 1
      make[3]: Target `__build' not remade because of errors.
      make[2]: *** [sound/isa/es1688] Error 2
      sound/isa/gus/gus_dma.c: In function ‘snd_gf1_dma_program’:
      sound/isa/gus/gus_dma.c:79:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/gus/gus_dma.c: In function ‘snd_gf1_dma_done’:
      sound/isa/gus/gus_dma.c:177:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/gus/gus_dma.o] Error 1
      sound/isa/gus/gus_pcm.c: In function ‘snd_gf1_pcm_capture_prepare’:
      sound/isa/gus/gus_pcm.c:591:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/gus/gus_pcm.c: In function ‘snd_gf1_pcm_capture_pointer’:
      sound/isa/gus/gus_pcm.c:619:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/gus/gus_pcm.o] Error 1
      make[3]: Target `__build' not remade because of errors.
      make[2]: *** [sound/isa/gus] Error 2
      sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’:
      sound/isa/sb/sb16_csp.c:228:227: error: case label does not reduce to an integer constant
      make[3]: *** [sound/isa/sb/sb16_csp.o] Error 1
      sound/isa/sb/sb16_main.c: In function ‘snd_sb16_playback_prepare’:
      sound/isa/sb/sb16_main.c:276:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/sb/sb16_main.c: In function ‘snd_sb16_playback_pointer’:
      sound/isa/sb/sb16_main.c:456:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/sb/sb16_main.o] Error 1
      sound/isa/sb/sb8_main.c: In function ‘snd_sb8_playback_prepare’:
      sound/isa/sb/sb8_main.c:172:3: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/sb/sb8_main.c: In function ‘snd_sb8_playback_pointer’:
      sound/isa/sb/sb8_main.c:425:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/sb/sb8_main.o] Error 1
      make[3]: Target `__build' not remade because of errors.
      make[2]: *** [sound/isa/sb] Error 2
      sound/isa/wss/wss_lib.c: In function ‘snd_wss_playback_prepare’:
      sound/isa/wss/wss_lib.c:1025:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
      sound/isa/wss/wss_lib.c: In function ‘snd_wss_playback_pointer’:
      sound/isa/wss/wss_lib.c:1160:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
      sound/isa/wss/wss_lib.c: In function ‘snd_wss_free’:
      sound/isa/wss/wss_lib.c:1695:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [sound/isa/wss/wss_lib.o] Error 1
      warning: (RADIO_MIROPCM20) selects SND_ISA which has unmet direct dependencies (SOUND && !M68K && SND && ISA && ISA_DMA_API)
      
      A build with ISA && ISA_DMA && !ISA_DMA_API results in:
        CC      sound/isa/es18xx.o
        CC      sound/isa/sscape.o
        CC      sound/isa/ad1816a/ad1816a_lib.o
        CC      sound/isa/es1688/es1688_lib.o
        CC      sound/isa/gus/gus_dma.o
        CC      sound/isa/gus/gus_pcm.o
        CC      sound/isa/sb/sb16_csp.o
        CC      sound/isa/sb/sb16_main.o
        CC      sound/isa/sb/sb8_main.o
        CC      sound/isa/wss/wss_lib.o
      
      The root cause for this is hidden in this Kconfig warning:
      
      Adding a dependency on ISA_DMA_API to RADIO_MIROPCM20 fixes these issues.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: NTakashi Iwai <tiwai@suse.de>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      4756fc64
    • C
      drm/i915/ringbuffer: Idling requires waiting for the ring to be empty · a94919ea
      Chris Wilson 提交于
      ...which is measured by the size and not the amount of space remaining.
      
      Waiting upon size-8, did one of two things. In the common case with more
      than 8 bytes available to write into the ring, it would return
      immediately. Otherwise, it would timeout given the impossible condition
      of waiting for more space than is available in the ring, leading to
      warnings such as:
      
      [drm:intel_cleanup_ring_buffer] *ERROR* failed to quiesce render ring
      whilst cleaning up: -16
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: NEric Anholt <eric@anholt.net>
      Signed-off-by: NKeith Packard <keithp@keithp.com>
      a94919ea
  10. 12 7月, 2011 2 次提交
    • K
      Revert "drm/i915: enable rc6 by default" · 05bd4268
      Keith Packard 提交于
      This reverts commit a51f7a66.
      
      We still have a few Ironlake and Sandybridge machines which fail when
      RC6 is enabled. Better luck next release?
      Signed-off-by: NKeith Packard <keithp@keithp.com>
      05bd4268
    • K
      drm/i915: Clean up i915_driver_load failure path · a7b85d2a
      Keith Packard 提交于
      i915_driver_load adds a write-combining MTRR region for the GTT
      aperture to improve memory speeds through the aperture. If
      i915_driver_load fails after this, it would not have cleaned up the
      MTRR. This shouldn't cause any problems, except for consuming an MTRR
      register. Still, it's best to clean up completely in the failure path,
      which is easily done by calling mtrr_del if the mtrr was successfully
      allocated.
      
      i915_driver_load calls i915_gem_load which register
      i915_gem_inactive_shrink. If i915_driver_load fails after calling
      i915_gem_load, the shrinker will be left registered. When called, it
      will access freed memory and crash. The fix is to unregister the shrinker in the
      failure path using code duplicated from i915_driver_unload.
      
      i915_driver_load also has some incorrect gotos in the error cleanup
      paths:
      
       * After failing to initialize the GTT (which cannot happen, btw,
         intel_gtt_get returns a fixed (non-NULL) value), it tries to
         free the uninitialized WC IO mapping. Fixed this by changing the
         target from out_iomapfree to out_rmmap
      Signed-off-by: NKeith Packard <keithp@keithp.com>
      Tested-by: NLin Ming <ming.m.lin@intel.com>
      a7b85d2a