From: Dave Airlie <airlied@redhat.com>
Date: Tue, 4 Jan 2011 22:31:08 +0000 (+1000)
Subject: Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f125010d2d02c481a0fdf5aee23a9f937bc5de1;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
---

4f125010d2d02c481a0fdf5aee23a9f937bc5de1
diff --cc drivers/gpu/drm/drm_irq.c
index 8304c42195fc,16d5155edad1..0054e957203f
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@@ -1088,13 -626,11 +1088,13 @@@ static int drm_queue_vblank_event(struc
  
  	e->event.sequence = vblwait->request.sequence;
  	if ((seq - vblwait->request.sequence) <= (1 << 23)) {
 +		e->event.sequence = seq;
  		e->event.tv_sec = now.tv_sec;
  		e->event.tv_usec = now.tv_usec;
- 		drm_vblank_put(dev, e->pipe);
+ 		drm_vblank_put(dev, pipe);
  		list_add_tail(&e->base.link, &e->base.file_priv->event_list);
  		wake_up_interruptible(&e->base.file_priv->event_wait);
 +		vblwait->reply.sequence = seq;
  		trace_drm_vblank_event_delivered(current->pid, pipe,
  						 vblwait->request.sequence);
  	} else {
diff --cc drivers/gpu/drm/i915/i915_dma.c
index 18746e6cb129,cb900dc83d95..8cb7f93732c2
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -2019,14 -2096,10 +2040,16 @@@ int i915_driver_load(struct drm_device 
  	dev_priv->mchdev_lock = &mchdev_lock;
  	spin_unlock(&mchdev_lock);
  
+ 	ips_ping_for_i915_load();
+ 
  	return 0;
  
 +out_gem_unload:
 +	if (dev->pdev->msi_enabled)
 +		pci_disable_msi(dev->pdev);
 +
 +	intel_teardown_gmbus(dev);
 +	intel_teardown_mchbar(dev);
  out_workqueue_free:
  	destroy_workqueue(dev_priv->wq);
  out_iomapfree:
diff --cc drivers/gpu/drm/i915/i915_reg.h
index d60860ec8cf4,cb8f43429279..8f948a6fbc1c
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@@ -2698,14 -2589,17 +2701,21 @@@
  #define GTIER   0x4401c
  
  #define ILK_DISPLAY_CHICKEN2	0x42004
 +/* Required on all Ironlake and Sandybridge according to the B-Spec. */
 +#define  ILK_ELPIN_409_SELECT	(1 << 25)
  #define  ILK_DPARB_GATE	(1<<22)
  #define  ILK_VSDPFD_FULL	(1<<21)
+ #define ILK_DISPLAY_CHICKEN_FUSES	0x42014
+ #define  ILK_INTERNAL_GRAPHICS_DISABLE	(1<<31)
+ #define  ILK_INTERNAL_DISPLAY_DISABLE	(1<<30)
+ #define  ILK_DISPLAY_DEBUG_DISABLE	(1<<29)
+ #define  ILK_HDCP_DISABLE		(1<<25)
+ #define  ILK_eDP_A_DISABLE		(1<<24)
+ #define  ILK_DESKTOP			(1<<23)
  #define ILK_DSPCLK_GATE		0x42020
  #define  ILK_DPARB_CLK_GATE	(1<<5)
 +#define  ILK_DPFD_CLK_GATE	(1<<7)
 +
  /* According to spec this bit 7/8/9 of 0x42020 should be set to enable FBC */
  #define   ILK_CLK_FBC		(1<<7)
  #define   ILK_DPFC_DIS1		(1<<8)
diff --cc drivers/gpu/drm/radeon/radeon_fb.c
index f7b4762fa6b6,6abea32be5e8..66324b5bb5ba
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@@ -245,8 -245,10 +245,8 @@@ static int radeonfb_create(struct radeo
  		goto out_unref;
  	}
  	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
- 	info->apertures->ranges[0].size = rdev->mc.real_vram_size;
+ 	info->apertures->ranges[0].size = rdev->mc.aper_size;
  
 -	info->fix.mmio_start = 0;
 -	info->fix.mmio_len = 0;
  	info->pixmap.size = 64*1024;
  	info->pixmap.buf_align = 8;
  	info->pixmap.access_align = 32;