From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Dec 2011 14:43:53 +0000 (+0000)
Subject: Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
X-Git-Tag: v3.3-rc1~121^2~60
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1fbe6f625f69e48c4001051dc1431afc704acfaa;p=linux.git

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c
---

1fbe6f625f69e48c4001051dc1431afc704acfaa
diff --cc drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 81fba29b696d,836f41008187..f79f768a56ca
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@@ -100,21 -99,21 +99,21 @@@ static int exynos_drm_fbdev_update(stru
  
  	exynos_fb->fb = fb;
  
 -	drm_fb_helper_fill_fix(fbi, fb->pitch, fb->depth);
 +	drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
- 	drm_fb_helper_fill_var(fbi, helper, fb_width, fb_height);
+ 	drm_fb_helper_fill_var(fbi, helper, fb->width, fb->height);
  
- 	entry = exynos_drm_fb_get_buf(fb);
- 	if (!entry) {
- 		DRM_LOG_KMS("entry is null.\n");
+ 	buffer = exynos_drm_fb_get_buf(fb);
+ 	if (!buffer) {
+ 		DRM_LOG_KMS("buffer is null.\n");
  		return -EFAULT;
  	}
  
  	offset = fbi->var.xoffset * (fb->bits_per_pixel >> 3);
 -	offset += fbi->var.yoffset * fb->pitch;
 +	offset += fbi->var.yoffset * fb->pitches[0];
  
- 	dev->mode_config.fb_base = entry->paddr;
- 	fbi->screen_base = entry->vaddr + offset;
- 	fbi->fix.smem_start = entry->paddr + offset;
+ 	dev->mode_config.fb_base = (resource_size_t)buffer->dma_addr;
+ 	fbi->screen_base = buffer->kvaddr + offset;
+ 	fbi->fix.smem_start = (unsigned long)(buffer->dma_addr + offset);
  	fbi->screen_size = size;
  	fbi->fix.smem_len = size;
  
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 9f592703c369,a1103fc6597d..22c8ab70db2c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -788,24 -810,9 +810,24 @@@ static struct vm_operations_struct i915
  	.close = drm_gem_vm_close,
  };
  
 +static const struct file_operations i915_driver_fops = {
 +	.owner = THIS_MODULE,
 +	.open = drm_open,
 +	.release = drm_release,
 +	.unlocked_ioctl = drm_ioctl,
 +	.mmap = drm_gem_mmap,
 +	.poll = drm_poll,
 +	.fasync = drm_fasync,
 +	.read = drm_read,
 +#ifdef CONFIG_COMPAT
 +	.compat_ioctl = i915_compat_ioctl,
 +#endif
 +	.llseek = noop_llseek,
 +};
 +
  static struct drm_driver driver = {
- 	/* don't use mtrr's here, the Xserver or user space app should
- 	 * deal with them for intel hardware.
+ 	/* Don't use MTRRs here; the Xserver or userspace app should
+ 	 * deal with them for Intel hardware.
  	 */
  	.driver_features =
  	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/