1. 05 1月, 2013 16 次提交
  2. 04 1月, 2013 24 次提交
    • C
      arm64: Always select ARM_AMBA and GENERIC_GPIO · 25c92a37
      Catalin Marinas 提交于
      Needed for most SoCs.
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      25c92a37
    • A
      drm/nouveau: fix init with agpgart-uninorth · eda85d6a
      Aaro Koskinen 提交于
      Check that the AGP aperture can be mapped. This follows a similar change
      done for Radeon (commit 365048ff, drm/radeon: AGP memory is only I/O if
      the aperture can be mapped by the CPU.).
      
      The patch fixes the following error seen on G5 iMac:
      
      	nouveau E[     DRM] failed to create kernel channel, -12
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58806
      Cc: stable@vger.kernel.org
      Reviewed-by: NMichel Dänzer <michel@daenzer.net>
      Signed-off-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      eda85d6a
    • G
      drm: nouveau: Fix build warning seen if HWMON is undefined · 57cdf82c
      Guenter Roeck 提交于
      Fix:
      
      nouveau_pm.c: In function ‘nouveau_hwmon_init’:
      nouveau_pm.c:703:24: warning: unused variable ‘therm’ [-Wunused-variable]
      
      Introduced by commit 095f979a (drm/nouveau/pm: fix build with HWMON off) which
      fixed a build error but introduced a build warning.
      
      Cc: Randy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      57cdf82c
    • D
      Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next · e61e512b
      Dave Airlie 提交于
      - fix the crashes related to DMA on r6xx
      - properly reset DMA on GPU reset
      - fix monitor probing with some DP bridges
      - misc small bug fixes
      
      * 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: switch to a finer grained reset for SI (v2)
        drm/radeon: switch to a finer grained reset for cayman/TN
        drm/radeon: switch to a finer grained reset for evergreen
        drm/radeon: switch to a finer grained reset for r6xx/7xx
        drm/radeon: add GPU reset flags
        drm/radeon: fix typo in evergreen dma fence
        drm/radeon: Properly handle DDC probe for DP bridges
        drm/radeon: reset dma engine on gpu reset (v2)
        drm/radeon: print dma status reg on lockup (v2)
        drm/radeon: improve ring debugfs printing
        drm/radeon: add debugfs file for dma rings
        drm/radeon/r6xx: fix DMA engine for ttm bo transfers
        drm/radeon: add connector table for Mac G4 Silver
      e61e512b
    • A
      drm/radeon: switch to a finer grained reset for SI (v2) · 06bc6df0
      Alex Deucher 提交于
      No change in functionality as we currently set all the reset
      flags.
      
      v2: fix typo
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      06bc6df0
    • A
      drm/radeon: switch to a finer grained reset for cayman/TN · 271d6fed
      Alex Deucher 提交于
      No change in functionality as we currently set all the reset
      flags.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      271d6fed
    • A
      drm/radeon: switch to a finer grained reset for evergreen · 0ecebb9e
      Alex Deucher 提交于
      No change in functionality as we currently set all the reset
      flags.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      0ecebb9e
    • A
      drm/radeon: switch to a finer grained reset for r6xx/7xx · 71e3d157
      Alex Deucher 提交于
      No change in functionality as we currently set all the reset
      flags.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      71e3d157
    • A
      drm/radeon: add GPU reset flags · ec46c76d
      Alex Deucher 提交于
      The idea here is to move to a finer grained reset.
      In some cases we may not need reset every block, and
      in other cases we may not need to re-init the entire
      asic.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      ec46c76d
    • A
      drm/radeon: fix typo in evergreen dma fence · 4b681c28
      Alex Deucher 提交于
      SRBM write packet takes DW aligned registers.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      4b681c28
    • L
      Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 49569646
      Linus Torvalds 提交于
      Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman:
       "Here are the remaining __dev* removal patches against the 3.8-rc2
        tree.  All of these patches were previously sent to the subsystem
        maintainers, most of them were picked up and pushed to you, but there
        were a number that fell through the cracks, and new drivers were added
        during the merge window, so this series cleans up the rest of the
        instances of these markings.
      
        Third time's the charm...
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.
      
      * tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits)
        misc: remove __dev* attributes.
        include: remove __dev* attributes.
        Documentation: remove __dev* attributes.
        Drivers: misc: remove __dev* attributes.
        Drivers: block: remove __dev* attributes.
        Drivers: bcma: remove __dev* attributes.
        Drivers: char: remove __dev* attributes.
        Drivers: clocksource: remove __dev* attributes.
        Drivers: ssb: remove __dev* attributes.
        Drivers: dma: remove __dev* attributes.
        Drivers: gpu: remove __dev* attributes.
        Drivers: infinband: remove __dev* attributes.
        Drivers: memory: remove __dev* attributes.
        Drivers: mmc: remove __dev* attributes.
        Drivers: iommu: remove __dev* attributes.
        Drivers: power: remove __dev* attributes.
        Drivers: message: remove __dev* attributes.
        Drivers: macintosh: remove __dev* attributes.
        Drivers: mfd: remove __dev* attributes.
        pstore: remove __dev* attributes.
        ...
      49569646
    • G
      misc: remove __dev* attributes. · 6ae14171
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the last of the __dev* markings from the kernel from
      a variety of different, tiny, places.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      6ae14171
    • G
      include: remove __dev* attributes. · e389623a
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit from some include files that
      were previously missed.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e389623a
    • G
      Documentation: remove __dev* attributes. · 63a29f74
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from the kernel documentation.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      63a29f74
    • G
      Drivers: misc: remove __dev* attributes. · 0fe763c5
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      0fe763c5
    • G
      Drivers: block: remove __dev* attributes. · 8d85fce7
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Mike Miller <mike.miller@hp.com>
      Cc: Chirag Kantharia <chirag.kantharia@hp.com>
      Cc: Geoff Levand <geoff@infradead.org>
      Cc: Jim Paris <jim@jtan.com>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: "Michael S. Tsirkin" <mst@redhat.com>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
      Cc: Keith Busch <keith.busch@intel.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: NeilBrown <neilb@suse.de>
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: Tao Guo <Tao.Guo@emc.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      8d85fce7
    • G
      Drivers: bcma: remove __dev* attributes. · 0f58a01d
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, and __devexit
      from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: "Rafał Miłecki" <zajec5@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      0f58a01d
    • G
      Drivers: char: remove __dev* attributes. · bcd2982a
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: David Airlie <airlied@linux.ie>
      Cc: Matt Mackall <mpm@selenic.com>
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      bcd2982a
    • G
      Drivers: clocksource: remove __dev* attributes. · 1850514b
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: John Stultz <johnstul@us.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      1850514b
    • G
      Drivers: ssb: remove __dev* attributes. · 163247c1
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, and __devexit from these
      drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Michael Buesch <m@bues.ch>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      163247c1
    • G
      Drivers: dma: remove __dev* attributes. · 4bf27b8b
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitconst,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Viresh Kumar <viresh.linux@gmail.com>
      Cc: Dan Williams <djbw@fb.com>
      Cc: Vinod Koul <vinod.koul@intel.com>
      Cc: Barry Song <baohua.song@csr.com>
      Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
      Cc: Alexander Duyck <alexander.h.duyck@intel.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Jassi Brar <jassisinghbrar@gmail.com>
      Cc: Dave Jiang <dave.jiang@intel.com>
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      4bf27b8b
    • G
      Drivers: gpu: remove __dev* attributes. · 56550d94
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, and __devexit
      from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: David Airlie <airlied@linux.ie>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      56550d94
    • G
      Drivers: infinband: remove __dev* attributes. · 1e6d9abe
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Tom Tucker <tom@opengridcomputing.com>
      Cc: Steve Wise <swise@opengridcomputing.com>
      Cc: Roland Dreier <roland@kernel.org>
      Cc: Sean Hefty <sean.hefty@intel.com>
      Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
      Cc: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
      Cc: Christoph Raisch <raisch@de.ibm.com>
      Cc: Mike Marciniszyn <infinipath@intel.com>
      Cc: Faisal Latif <faisal.latif@intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      1e6d9abe
    • G
      Drivers: memory: remove __dev* attributes. · 27796aa0
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, and
      __devinitconst, from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Hiroshi DOYU <hdoyu@nvidia.com>
      Cc: Stephen Warren <swarren@nvidia.com>
      Cc: Axel Lin <axel.lin@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      27796aa0