From: Dave Airlie <airlied@redhat.com>
Date: Sat, 8 Dec 2012 03:17:07 +0000 (+1000)
Subject: Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a1494def7eacbd25db05185aa2e81ef90892460;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next

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
---

1a1494def7eacbd25db05185aa2e81ef90892460
diff --cc drivers/gpu/drm/nouveau/nouveau_abi16.c
index d48c02a36527,cbf1fc60a386..41241922263f
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@@ -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);
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index 655d57f188d9,d1498bfd7873..e88b0eb1a179
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@@ -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)