From: Dave Airlie <airlied@redhat.com>
Date: Mon, 14 Mar 2011 04:15:13 +0000 (+1000)
Subject: Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34db18abd376b2075c760c38f0b861aed379415d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

* 'intel/drm-intel-next' of ../drm-next: (755 commits)
  drm/i915: Only wait on a pending flip if we intend to write to the buffer
  drm/i915/dp: Sanity check eDP existence
  drm/i915: Rebind the buffer if its alignment constraints changes with tiling
  drm/i915: Disable GPU semaphores by default
  drm/i915: Do not overflow the MMADDR write FIFO
  Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
  drm/i915: Don't save/restore hardware status page address register
  drm/i915: don't store the reg value for HWS_PGA
  drm/i915: fix memory corruption with GM965 and >4GB RAM
  Linux 2.6.38-rc7
  Revert "TPM: Long default timeout fix"
  drm/i915: Re-enable GPU semaphores for SandyBridge mobile
  drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#"
  Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU"
  drm/i915: Allow relocation deltas outside of target bo
  drm/i915: Silence an innocuous compiler warning for an unused variable
  fs/block_dev.c: fix new kernel-doc warning
  ACPI: Fix build for CONFIG_NET unset
  mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>
  x86: Use u32 instead of long to set reset vector back to 0
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
---

34db18abd376b2075c760c38f0b861aed379415d
diff --cc drivers/gpu/drm/i915/i915_gem.c
index bc7f06b8fbca,950a5ab921ad..c4c2855d002d
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -1471,8 -1462,8 +1477,8 @@@ i915_gem_mmap_gtt(struct drm_file *file
  	if (ret)
  		return ret;
  
 -	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
 +	obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle));
- 	if (obj == NULL) {
+ 	if (&obj->base == NULL) {
  		ret = -ENOENT;
  		goto unlock;
  	}
diff --cc drivers/gpu/drm/radeon/atombios_crtc.c
index d56f08d3cbdc,a4e5e53e0a62..a2199fe9fa9b
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@@ -1137,15 -1133,9 +1133,9 @@@ static int dce4_crtc_do_set_base(struc
  	WREG32(EVERGREEN_VIEWPORT_SIZE + radeon_crtc->crtc_offset,
  	       (crtc->mode.hdisplay << 16) | crtc->mode.vdisplay);
  
- 	if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE)
- 		WREG32(EVERGREEN_DATA_FORMAT + radeon_crtc->crtc_offset,
- 		       EVERGREEN_INTERLEAVE_EN);
- 	else
- 		WREG32(EVERGREEN_DATA_FORMAT + radeon_crtc->crtc_offset, 0);
- 
  	if (!atomic && fb && fb != crtc->fb) {
  		radeon_fb = to_radeon_framebuffer(fb);
 -		rbo = radeon_fb->obj->driver_private;
 +		rbo = gem_to_radeon_bo(radeon_fb->obj);
  		r = radeon_bo_reserve(rbo, false);
  		if (unlikely(r != 0))
  			return r;
@@@ -1300,15 -1290,9 +1290,9 @@@ static int avivo_crtc_do_set_base(struc
  	WREG32(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset,
  	       (crtc->mode.hdisplay << 16) | crtc->mode.vdisplay);
  
- 	if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE)
- 		WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset,
- 		       AVIVO_D1MODE_INTERLEAVE_EN);
- 	else
- 		WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, 0);
- 
  	if (!atomic && fb && fb != crtc->fb) {
  		radeon_fb = to_radeon_framebuffer(fb);
 -		rbo = radeon_fb->obj->driver_private;
 +		rbo = gem_to_radeon_bo(radeon_fb->obj);
  		r = radeon_bo_reserve(rbo, false);
  		if (unlikely(r != 0))
  			return r;
diff --cc include/drm/drmP.h
index 835214761d4f,348843b80150..ad5770f2315c
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@@ -1131,10 -1099,9 +1131,10 @@@ struct drm_device 
  #endif
  
  	struct platform_device *platformdev; /**< Platform device struture */
 +	struct usb_device *usbdev;
  
  	struct drm_sg_mem *sg;	/**< Scatter gather memory */
- 	int num_crtcs;                  /**< Number of CRTCs on this device */
+ 	unsigned int num_crtcs;                  /**< Number of CRTCs on this device */
  	void *dev_private;		/**< device private data */
  	void *mm_private;
  	struct address_space *dev_mapping;