1. 05 4月, 2016 1 次提交
    • A
      iommu: provide of_xlate pointer unconditionally · b70bb984
      Arnd Bergmann 提交于
      iommu drivers that support the standard DT bindings use a of_xlate
      callback pointer, but that is only part of struct iommu_ops when
      CONFIG_OF_IOMMU is enabled, leading to build errors in randconfig
      builds when that is not provided:
      
      drivers/iommu/mtk_iommu.c:497:2: error: unknown field 'of_xlate' specified in initializer
        .of_xlate = mtk_iommu_of_xlate,
        ^
      drivers/iommu/mtk_iommu.c:497:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
        .of_xlate = mtk_iommu_of_xlate,
                    ^~~~~~~~~~~~~~~~~~
      drivers/iommu/mtk_iommu.c:497:14: note: (near initialization for 'mtk_iommu_ops.domain_get_attr')
      
      We can work around it by adding more #ifdefs in each driver, but
      it seems nicer to just allow setting the pointer even if it is
      unused. This makes the driver code look nicer, and it gives better
      compile-time coverage when test building on other architectures.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 0df4fabe ("iommu/mediatek: Add mt8173 IOMMU driver")
      Reviewed-by: NRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: NJoerg Roedel <jroedel@suse.de>
      b70bb984
  2. 03 4月, 2016 9 次提交
  3. 02 4月, 2016 29 次提交
  4. 01 4月, 2016 1 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6ddf37da
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too crazy in here: a bunch of AMD fixes/quirks, two msm fixes,
        some rockchip fixes, and a udl warning fix, along with one locking fix
        for displayport that seems to fix some dodgy monitors"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/udl: Use unlocked gem unreferencing
        drm/dp: move hw_mutex up the call stack
        drm/amdgpu: Don't move pinned BOs
        drm/radeon: Don't move pinned BOs
        drm/radeon: add a dpm quirk for all R7 370 parts
        drm/radeon: add another R7 370 quirk
        drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
        drm/rockchip: vop: Fix vop crtc cleanup
        drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
        drm/rockchip: vop: Disable planes when disabling CRTC
        drm/rockchip: vop: Don't reject empty modesets
        drm/rockchip: cancel pending vblanks on close
        drm/rockchip: vop: fix crtc size in plane check
        drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
        drm/amd: Beef up ACP Kconfig menu text
        drm/msm: fix typo in the !COMMON_CLK case
        drm/msm: fix bug after preclose removal
      6ddf37da