]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Sat, 8 Dec 2012 03:17:07 +0000 (13:17 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 10 Dec 2012 10:03:58 +0000 (20:03 +1000)
Alex writes:
Pretty minor -next pull request.  We some additional new bits waiting
internally for release.  Hopefully Monday we can get at least some of
them out.  The others will probably take a few more weeks.

Highlights of the current request:
- ELD registers for passing audio information to the sound hardware
- Handle GPUVM page faults more gracefully
- Misc fixes

Merge radeon test
* 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
  drm/radeon: bump driver version for new info ioctl requests
  drm/radeon: fix eDP clk and lane setup for scaled modes
  drm/radeon: add new INFO ioctl requests
  drm/radeon/dce32+: use fractional fb dividers for high clocks
  drm/radeon: use cached memory when evicting for vram on non agp
  drm/radeon: add a CS flag END_OF_FRAME
  drm/radeon: stop page faults from hanging the system (v2)
  drm/radeon/dce4/5: add registers for ELD handling
  drm/radeon/dce3.2: add registers for ELD handling
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Linux 3.7-rc7
  powerpc/eeh: Do not invalidate PE properly
  Revert "drm/i915: enable rc6 on ilk again"
  ALSA: hda - Fix build without CONFIG_PM
  of/address: sparc: Declare of_iomap as an extern function for sparc again
  PM / QoS: fix wrong error-checking condition
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  MPI: Fix compilation on MIPS with GCC 4.4 and newer
  ...

Conflicts:
drivers/gpu/drm/exynos/exynos_drm_encoder.c
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

19 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/exynos/exynos_drm_encoder.c
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
drivers/gpu/drm/nouveau/core/include/core/object.h
drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
drivers/gpu/drm/nouveau/nouveau_abi16.c
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d48c02a365271fff00524dc8f890da1116f0651b,cbf1fc60a38682be197dc1bb1f0f15c8853a06e6..41241922263fd79641a2486033d933932025524e
@@@ -241,7 -241,15 +241,11 @@@ nouveau_abi16_ioctl_channel_alloc(ABI16
  
        if (unlikely(!abi16))
                return -ENOMEM;
+       if (!drm->channel)
+               return nouveau_abi16_put(abi16, -ENODEV);
        client = nv_client(abi16->client);
 -
 -      if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
 -              return nouveau_abi16_put(abi16, -EINVAL);
 -
        device = nv_device(abi16->device);
        imem   = nouveau_instmem(device);
        pfb    = nouveau_fb(device);
Simple merge
Simple merge
index 655d57f188d9a46deec503cc93b349f0ee3270ec,d1498bfd78732ef519f50d6fea726d502cffd824..e88b0eb1a179359c8c5667e49ea35f0940cd16f4
@@@ -303,9 -304,9 +303,9 @@@ void vmw_bo_pin(struct ttm_buffer_objec
        uint32_t old_mem_type = bo->mem.mem_type;
        int ret;
  
 -      BUG_ON(!atomic_read(&bo->reserved));
 +      BUG_ON(!ttm_bo_is_reserved(bo));
        BUG_ON(old_mem_type != TTM_PL_VRAM &&
-              old_mem_type != VMW_PL_FLAG_GMR);
+              old_mem_type != VMW_PL_GMR);
  
        pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;
        if (pin)
Simple merge
Simple merge