From 52f9028c84baea81230dc673b756552e8e90aecd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 11:21:06 +1000
Subject: Initial import of modesetting for intel driver in DRM

---
 linux-core/i915_drv.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 7fdb0839..b9e624f9 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -79,6 +79,7 @@ static struct drm_driver driver = {
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL |
 	    DRIVER_IRQ_VBL2,
 	.load = i915_driver_load,
+	.unload = i915_driver_unload,
 	.firstopen = i915_driver_firstopen,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
-- 
cgit v1.2.3


From cc471a361fc7058df4fb8d15d9c9a8b5cdd3dd77 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Fri, 13 Apr 2007 14:33:52 +1000
Subject: i915/drm: clean up a lot of the i915/drm startup/teardown sequences

When the kernel driver is loaded it sets up a lot of stuff..
it tears down the same stuff on unload.

This add a new map type called DRM_DRIVER which means the driver will clean the mapping up
and fix up the map cleaner
---
 linux-core/i915_drv.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index b9e624f9..50ff9771 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -80,7 +80,6 @@ static struct drm_driver driver = {
 	    DRIVER_IRQ_VBL2,
 	.load = i915_driver_load,
 	.unload = i915_driver_unload,
-	.firstopen = i915_driver_firstopen,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
 	.device_is_agp = i915_driver_device_is_agp,
-- 
cgit v1.2.3


From a18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 17 May 2007 09:00:06 -0700
Subject: Fix FB pitch value (we had it wrong and were working around it in a
 few places). Add new FB hooks to the drm driver structure and make i915 use
 them for an Intel specific FB driver.  This will allow acceleration and
 better handling of the command stream.

---
 linux-core/i915_drv.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 50ff9771..ecf42771 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -30,6 +30,7 @@
 #include "drmP.h"
 #include "drm.h"
 #include "i915_drm.h"
+#include "intel_drv.h"
 #include "i915_drv.h"
 
 #include "drm_pciids.h"
@@ -92,6 +93,8 @@ static struct drm_driver driver = {
 	.reclaim_buffers = drm_core_reclaim_buffers,
 	.get_map_ofs = drm_core_get_map_ofs,
 	.get_reg_ofs = drm_core_get_reg_ofs,
+	.fb_probe = intelfb_probe,
+	.fb_remove = intelfb_remove,
 	.ioctls = i915_ioctls,
 	.fops = {
 		.owner = THIS_MODULE,
-- 
cgit v1.2.3


From e918d2b7814e2cf5345dba63031c402010b1d3e4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 22 May 2007 13:38:58 -0700
Subject: Call preallocated space VRAM instead of PRIV0 to be more consistent
 with other drivers.

---
 linux-core/i915_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ecf42771..4d4029aa 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -53,8 +53,8 @@ static drm_fence_driver_t i915_fence_driver = {
 #endif
 #ifdef I915_HAVE_BUFFER
 
-static uint32_t i915_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
-static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_LOCAL};
+static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
+static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
 
 static drm_bo_driver_t i915_bo_driver = {
 	.mem_type_prio = i915_mem_prios,
-- 
cgit v1.2.3


From 462d5a0dfc80dfa02da3d24d30ad90ad0387f0a2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 22 May 2007 17:49:04 -0700
Subject: Suspend/resume support (incomplete).

---
 linux-core/i915_drv.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 4d4029aa..ffdbab06 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -70,6 +70,235 @@ static drm_bo_driver_t i915_bo_driver = {
 };
 #endif
 
+static int i915_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+	struct drm_device *dev = pci_get_drvdata(pdev);
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_output *output;
+	int i;
+
+	pci_save_state(pdev);
+
+	/* Save video mode information for native mode-setting. */
+	dev_priv->saveDSPACNTR = I915_READ(DSPACNTR);
+	dev_priv->savePIPEACONF = I915_READ(PIPEACONF);
+	dev_priv->savePIPEASRC = I915_READ(PIPEASRC);
+	dev_priv->saveFPA0 = I915_READ(FPA0);
+	dev_priv->saveFPA1 = I915_READ(FPA1);
+	dev_priv->saveDPLL_A = I915_READ(DPLL_A);
+	if (IS_I965G(dev))
+		dev_priv->saveDPLL_A_MD = I915_READ(DPLL_A_MD);
+	dev_priv->saveHTOTAL_A = I915_READ(HTOTAL_A);
+	dev_priv->saveHBLANK_A = I915_READ(HBLANK_A);
+	dev_priv->saveHSYNC_A = I915_READ(HSYNC_A);
+	dev_priv->saveVTOTAL_A = I915_READ(VTOTAL_A);
+	dev_priv->saveVBLANK_A = I915_READ(VBLANK_A);
+	dev_priv->saveVSYNC_A = I915_READ(VSYNC_A);
+	dev_priv->saveDSPASTRIDE = I915_READ(DSPASTRIDE);
+	dev_priv->saveDSPASIZE = I915_READ(DSPASIZE);
+	dev_priv->saveDSPAPOS = I915_READ(DSPAPOS);
+	dev_priv->saveDSPABASE = I915_READ(DSPABASE);
+
+	for(i= 0; i < 256; i++)
+		dev_priv->savePaletteA[i] = I915_READ(PALETTE_A + (i << 2));
+
+	if(dev->mode_config.num_crtc == 2) {
+		dev_priv->savePIPEBCONF = I915_READ(PIPEBCONF);
+		dev_priv->savePIPEBSRC = I915_READ(PIPEBSRC);
+		dev_priv->saveDSPBCNTR = I915_READ(DSPBCNTR);
+		dev_priv->saveFPB0 = I915_READ(FPB0);
+		dev_priv->saveFPB1 = I915_READ(FPB1);
+		dev_priv->saveDPLL_B = I915_READ(DPLL_B);
+		if (IS_I965G(dev))
+			dev_priv->saveDPLL_B_MD = I915_READ(DPLL_B_MD);
+		dev_priv->saveHTOTAL_B = I915_READ(HTOTAL_B);
+		dev_priv->saveHBLANK_B = I915_READ(HBLANK_B);
+		dev_priv->saveHSYNC_B = I915_READ(HSYNC_B);
+		dev_priv->saveVTOTAL_B = I915_READ(VTOTAL_B);
+		dev_priv->saveVBLANK_B = I915_READ(VBLANK_B);
+		dev_priv->saveVSYNC_B = I915_READ(VSYNC_B);
+		dev_priv->saveDSPBSTRIDE = I915_READ(DSPBSTRIDE);
+		dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE);
+		dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);
+		dev_priv->saveDSPBBASE = I915_READ(DSPBBASE);
+		for(i= 0; i < 256; i++)
+			dev_priv->savePaletteB[i] =
+				I915_READ(PALETTE_B + (i << 2));
+	}
+
+	if (IS_I965G(dev)) {
+		dev_priv->saveDSPASURF = I915_READ(DSPASURF);
+		dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);
+	}
+
+	dev_priv->saveVCLK_DIVISOR_VGA0 = I915_READ(VCLK_DIVISOR_VGA0);
+	dev_priv->saveVCLK_DIVISOR_VGA1 = I915_READ(VCLK_DIVISOR_VGA1);
+	dev_priv->saveVCLK_POST_DIV = I915_READ(VCLK_POST_DIV);
+	dev_priv->saveVGACNTRL = I915_READ(VGACNTRL);
+
+	for(i = 0; i < 7; i++) {
+		dev_priv->saveSWF[i] = I915_READ(SWF0 + (i << 2));
+		dev_priv->saveSWF[i+7] = I915_READ(SWF00 + (i << 2));
+	}
+	dev_priv->saveSWF[14] = I915_READ(SWF30);
+	dev_priv->saveSWF[15] = I915_READ(SWF31);
+	dev_priv->saveSWF[16] = I915_READ(SWF32);
+
+	if (IS_MOBILE(dev) && !IS_I830(dev))
+		dev_priv->saveLVDS = I915_READ(LVDS);
+	dev_priv->savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
+
+	list_for_each_entry(output, &dev->mode_config.output_list, head)
+		if (output->funcs->save)
+			(*output->funcs->save) (output);
+
+#if 0 /* FIXME: save VGA bits */
+	vgaHWUnlock(hwp);
+	vgaHWSave(pScrn, vgaReg, VGA_SR_FONTS);
+#endif
+	pci_disable_device(pdev);
+	pci_set_power_state(pdev, PCI_D3hot);
+
+	return 0;
+}
+
+static int i915_resume(struct pci_dev *pdev)
+{
+	struct drm_device *dev = pci_get_drvdata(pdev);
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_output *output;
+	struct drm_crtc *crtc;
+	int i;
+
+	pci_set_power_state(pdev, PCI_D0);
+	pci_restore_state(pdev);
+	pci_enable_device(pdev);
+
+	/* Disable outputs */
+	list_for_each_entry(output, &dev->mode_config.output_list, head)
+		output->funcs->dpms(output, DPMSModeOff);
+
+	i915_driver_wait_next_vblank(dev, 0);
+   
+	/* Disable pipes */
+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
+		crtc->funcs->dpms(crtc, DPMSModeOff);
+
+	/* FIXME: wait for vblank on each pipe? */
+	i915_driver_wait_next_vblank(dev, 0);
+
+	if (IS_MOBILE(dev) && !IS_I830(dev))
+		I915_WRITE(LVDS, dev_priv->saveLVDS);
+
+	if (!IS_I830(dev) && !IS_845G(dev))
+		I915_WRITE(PFIT_CONTROL, dev_priv->savePFIT_CONTROL);
+
+	if (dev_priv->saveDPLL_A & DPLL_VCO_ENABLE) {
+		I915_WRITE(DPLL_A, dev_priv->saveDPLL_A & ~DPLL_VCO_ENABLE);
+		udelay(150);
+	}
+	I915_WRITE(FPA0, dev_priv->saveFPA0);
+	I915_WRITE(FPA1, dev_priv->saveFPA1);
+	I915_WRITE(DPLL_A, dev_priv->saveDPLL_A);
+	udelay(150);
+	if (IS_I965G(dev))
+		I915_WRITE(DPLL_A_MD, dev_priv->saveDPLL_A_MD);
+	else
+		I915_WRITE(DPLL_A, dev_priv->saveDPLL_A);
+	udelay(150);
+
+	I915_WRITE(HTOTAL_A, dev_priv->saveHTOTAL_A);
+	I915_WRITE(HBLANK_A, dev_priv->saveHBLANK_A);
+	I915_WRITE(HSYNC_A, dev_priv->saveHSYNC_A);
+	I915_WRITE(VTOTAL_A, dev_priv->saveVTOTAL_A);
+	I915_WRITE(VBLANK_A, dev_priv->saveVBLANK_A);
+	I915_WRITE(VSYNC_A, dev_priv->saveVSYNC_A);
+   
+	I915_WRITE(DSPASTRIDE, dev_priv->saveDSPASTRIDE);
+	I915_WRITE(DSPASIZE, dev_priv->saveDSPASIZE);
+	I915_WRITE(DSPAPOS, dev_priv->saveDSPAPOS);
+	I915_WRITE(PIPEASRC, dev_priv->savePIPEASRC);
+	I915_WRITE(DSPABASE, dev_priv->saveDSPABASE);
+	if (IS_I965G(dev))
+		I915_WRITE(DSPASURF, dev_priv->saveDSPASURF);
+	I915_WRITE(PIPEACONF, dev_priv->savePIPEACONF);
+	i915_driver_wait_next_vblank(dev, 0);
+	I915_WRITE(DSPACNTR, dev_priv->saveDSPACNTR);
+	I915_WRITE(DSPABASE, I915_READ(DSPABASE));
+	i915_driver_wait_next_vblank(dev, 0);
+   
+	if(dev->mode_config.num_crtc == 2) {
+		if (dev_priv->saveDPLL_B & DPLL_VCO_ENABLE) {
+			I915_WRITE(DPLL_B, dev_priv->saveDPLL_B & ~DPLL_VCO_ENABLE);
+			udelay(150);
+		}
+		I915_WRITE(FPB0, dev_priv->saveFPB0);
+		I915_WRITE(FPB1, dev_priv->saveFPB1);
+		I915_WRITE(DPLL_B, dev_priv->saveDPLL_B);
+		udelay(150);
+		if (IS_I965G(dev))
+			I915_WRITE(DPLL_B_MD, dev_priv->saveDPLL_B_MD);
+		else
+			I915_WRITE(DPLL_B, dev_priv->saveDPLL_B);
+		udelay(150);
+   
+		I915_WRITE(HTOTAL_B, dev_priv->saveHTOTAL_B);
+		I915_WRITE(HBLANK_B, dev_priv->saveHBLANK_B);
+		I915_WRITE(HSYNC_B, dev_priv->saveHSYNC_B);
+		I915_WRITE(VTOTAL_B, dev_priv->saveVTOTAL_B);
+		I915_WRITE(VBLANK_B, dev_priv->saveVBLANK_B);
+		I915_WRITE(VSYNC_B, dev_priv->saveVSYNC_B);
+		I915_WRITE(DSPBSTRIDE, dev_priv->saveDSPBSTRIDE);
+		I915_WRITE(DSPBSIZE, dev_priv->saveDSPBSIZE);
+		I915_WRITE(DSPBPOS, dev_priv->saveDSPBPOS);
+		I915_WRITE(PIPEBSRC, dev_priv->savePIPEBSRC);
+		I915_WRITE(DSPBBASE, dev_priv->saveDSPBBASE);
+		if (IS_I965G(dev))
+			I915_WRITE(DSPBSURF, dev_priv->saveDSPBSURF);
+		I915_WRITE(PIPEBCONF, dev_priv->savePIPEBCONF);
+		i915_driver_wait_next_vblank(dev, 0);
+		I915_WRITE(DSPBCNTR, dev_priv->saveDSPBCNTR);
+		I915_WRITE(DSPBBASE, I915_READ(DSPBBASE));
+		i915_driver_wait_next_vblank(dev, 0);
+	}
+
+	/* Restore outputs */
+	list_for_each_entry(output, &dev->mode_config.output_list, head)
+		if (output->funcs->restore)
+			output->funcs->restore(output);
+    
+	I915_WRITE(VGACNTRL, dev_priv->saveVGACNTRL);
+
+	I915_WRITE(VCLK_DIVISOR_VGA0, dev_priv->saveVCLK_DIVISOR_VGA0);
+	I915_WRITE(VCLK_DIVISOR_VGA1, dev_priv->saveVCLK_DIVISOR_VGA1);
+	I915_WRITE(VCLK_POST_DIV, dev_priv->saveVCLK_POST_DIV);
+
+	for(i = 0; i < 256; i++)
+		I915_WRITE(PALETTE_A + (i << 2), dev_priv->savePaletteA[i]);
+   
+	if(dev->mode_config.num_crtc == 2)
+		for(i= 0; i < 256; i++)
+			I915_WRITE(PALETTE_B + (i << 2), dev_priv->savePaletteB[i]);
+
+	for(i = 0; i < 7; i++) {
+		I915_WRITE(SWF0 + (i << 2), dev_priv->saveSWF[i]);
+		I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF[i+7]);
+	}
+
+	I915_WRITE(SWF30, dev_priv->saveSWF[14]);
+	I915_WRITE(SWF31, dev_priv->saveSWF[15]);
+	I915_WRITE(SWF32, dev_priv->saveSWF[16]);
+
+#if 0 /* FIXME: restore VGA bits */
+	vgaHWRestore(pScrn, vgaReg, VGA_SR_FONTS);
+	vgaHWLock(hwp);
+#endif
+
+	drm_initial_config(dev, 0);
+
+	return 0;
+}
+
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
 	/* don't use mtrr's here, the Xserver or user space app should
@@ -113,6 +342,8 @@ static struct drm_driver driver = {
 		.id_table = pciidlist,
 		.probe = probe,
 		.remove = __devexit_p(drm_cleanup_pci),
+		.suspend = i915_suspend,
+		.resume = i915_resume,
 		},
 #ifdef I915_HAVE_FENCE
 	.fence_driver = &i915_fence_driver,
-- 
cgit v1.2.3


From fa92e1f2ec396d2e772734f726a0958801b9fc99 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 24 May 2007 18:41:44 -0700
Subject: Suspend/resume shouldn't call drm_initial_config (seems to work ok
 for me now), also we should fail if we can't enable the device at resume
 time.

---
 linux-core/i915_drv.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ffdbab06..d58ca589 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -172,7 +172,8 @@ static int i915_resume(struct pci_dev *pdev)
 
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
-	pci_enable_device(pdev);
+	if (pci_enable_device(pdev))
+		return -1;
 
 	/* Disable outputs */
 	list_for_each_entry(output, &dev->mode_config.output_list, head)
@@ -294,8 +295,6 @@ static int i915_resume(struct pci_dev *pdev)
 	vgaHWLock(hwp);
 #endif
 
-	drm_initial_config(dev, 0);
-
 	return 0;
 }
 
-- 
cgit v1.2.3


From e239882b1e90cba0297118ec7dc432bea06b0bd0 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 4 Dec 2007 15:36:36 +0100
Subject: Modesetting Hotplug

---
 linux-core/i915_drv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index fb4149c4..598039dc 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -541,8 +541,8 @@ static struct drm_driver driver = {
 	    DRIVER_IRQ_VBL2,
 	.load = i915_driver_load,
 	.unload = i915_driver_unload,
-	.lastclose = i915_driver_lastclose,
-	.preclose = i915_driver_preclose,
+/*	.lastclose = i915_driver_lastclose,
+	.preclose = i915_driver_preclose, */
 	.suspend = i915_suspend,
 	.resume = i915_resume,
 	.device_is_agp = i915_driver_device_is_agp,
@@ -557,6 +557,7 @@ static struct drm_driver driver = {
 	.get_reg_ofs = drm_core_get_reg_ofs,
 	.fb_probe = intelfb_probe,
 	.fb_remove = intelfb_remove,
+	.fb_resize = intelfb_resize,
 	.ioctls = i915_ioctls,
 	.fops = {
 		.owner = THIS_MODULE,
-- 
cgit v1.2.3


From 0fbee62ec14d08714dbc558dd20cc00b9a79c042 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Feb 2008 15:19:42 +1000
Subject: major port of multi-master ideas into modesetting

---
 linux-core/i915_drv.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 629a39be..1f841642 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -558,6 +558,8 @@ static struct drm_driver driver = {
 	.fb_probe = intelfb_probe,
 	.fb_remove = intelfb_remove,
 	.fb_resize = intelfb_resize,
+	.master_create = i915_master_create,
+	.master_destroy = i915_master_destroy,
 	.ioctls = i915_ioctls,
 	.fops = {
 		.owner = THIS_MODULE,
-- 
cgit v1.2.3


From 01dcc47d895997f77c9457558e974d41c23ed4e1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Feb 2008 16:24:17 +1000
Subject: drm: add modesetting as a driver feature.

This change adds a driver feature that for i915 is controlled by a module
parameter. You now need to do insmod i915.ko modeset=1 to enable it the
modesetting paths.

It also fixes up lots of X paths. I can run my new DDX driver on this code
with and without modesetting enabled
---
 linux-core/i915_drv.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 6c12f1a1..b844dfe6 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -39,6 +39,9 @@ static struct pci_device_id pciidlist[] = {
 	i915_PCI_IDS
 };
 
+unsigned int i915_modeset = 0;
+module_param_named(modeset, i915_modeset, int, 0400);
+
 #ifdef I915_HAVE_FENCE
 extern struct drm_fence_driver i915_fence_driver;
 #endif
@@ -563,8 +566,8 @@ static struct drm_driver driver = {
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
 	.load = i915_driver_load,
 	.unload = i915_driver_unload,
-/*	.lastclose = i915_driver_lastclose,
-	.preclose = i915_driver_preclose, */
+	.lastclose = i915_driver_lastclose,
+	.preclose = i915_driver_preclose,
 	.suspend = i915_suspend,
 	.resume = i915_resume,
 	.device_is_agp = i915_driver_device_is_agp,
@@ -624,6 +627,9 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 static int __init i915_init(void)
 {
 	driver.num_ioctls = i915_max_ioctl;
+	if (i915_modeset == 1)
+		driver.driver_features |= DRIVER_MODESET;
+
 	return drm_init(&driver, pciidlist);
 }
 
-- 
cgit v1.2.3


From 4dbf447f4305e3c2aa8914b5ccfc07d9bf8ef28e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Wed, 5 Mar 2008 15:28:38 +1000
Subject: drm: fixup compat with old x.org drivers

---
 linux-core/i915_drv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index b844dfe6..0e65c0cd 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -48,8 +48,8 @@ extern struct drm_fence_driver i915_fence_driver;
 
 #ifdef I915_HAVE_BUFFER
 
-static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
-static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
+static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
+static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
 
 static struct drm_bo_driver i915_bo_driver = {
 	.mem_type_prio = i915_mem_prios,
@@ -566,6 +566,7 @@ static struct drm_driver driver = {
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
 	.load = i915_driver_load,
 	.unload = i915_driver_unload,
+	.firstopen = i915_driver_firstopen,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
 	.suspend = i915_suspend,
-- 
cgit v1.2.3


From ee631e1b8604a176b9118396998ce5bfc6475dae Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Tue, 13 May 2008 14:44:17 -0700
Subject: i915: register definition & header file cleanup

It would be nice if one day the DRM driver was the canonical source for
register definitions and core macros.  To that end, this patch cleans
things up quite a bit, removing redundant definitions (some with
different names referring to the same register) and generally tidying up
the header file.
---
 linux-core/i915_drv.c | 59 +++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ec91fb93..27c239d0 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -67,11 +67,6 @@ static struct drm_bo_driver i915_bo_driver = {
 };
 #endif
 
-enum pipe {
-    PIPE_A = 0,
-    PIPE_B,
-};
-
 static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -308,13 +303,13 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 	dev_priv->saveDSPASTRIDE = I915_READ(DSPASTRIDE);
 	dev_priv->saveDSPASIZE = I915_READ(DSPASIZE);
 	dev_priv->saveDSPAPOS = I915_READ(DSPAPOS);
-	dev_priv->saveDSPABASE = I915_READ(DSPABASE);
+	dev_priv->saveDSPAADDR = I915_READ(DSPAADDR);
 	if (IS_I965G(dev)) {
 		dev_priv->saveDSPASURF = I915_READ(DSPASURF);
 		dev_priv->saveDSPATILEOFF = I915_READ(DSPATILEOFF);
 	}
 	i915_save_palette(dev, PIPE_A);
-	dev_priv->savePIPEASTAT = I915_READ(I915REG_PIPEASTAT);
+	dev_priv->savePIPEASTAT = I915_READ(PIPEASTAT);
 
 	/* Pipe & plane B info */
 	dev_priv->savePIPEBCONF = I915_READ(PIPEBCONF);
@@ -336,13 +331,13 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 	dev_priv->saveDSPBSTRIDE = I915_READ(DSPBSTRIDE);
 	dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE);
 	dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);
-	dev_priv->saveDSPBBASE = I915_READ(DSPBBASE);
+	dev_priv->saveDSPBADDR = I915_READ(DSPBADDR);
 	if (IS_I965GM(dev) || IS_IGD_GM(dev)) {
 		dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);
 		dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);
 	}
 	i915_save_palette(dev, PIPE_B);
-	dev_priv->savePIPEBSTAT = I915_READ(I915REG_PIPEBSTAT);
+	dev_priv->savePIPEBSTAT = I915_READ(PIPEBSTAT);
 
 	/* CRT state */
 	dev_priv->saveADPA = I915_READ(ADPA);
@@ -357,9 +352,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 		dev_priv->saveLVDS = I915_READ(LVDS);
 	if (!IS_I830(dev) && !IS_845G(dev))
 		dev_priv->savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
-	dev_priv->saveLVDSPP_ON = I915_READ(LVDSPP_ON);
-	dev_priv->saveLVDSPP_OFF = I915_READ(LVDSPP_OFF);
-	dev_priv->savePP_CYCLE = I915_READ(PP_CYCLE);
+	dev_priv->savePP_ON_DELAYS = I915_READ(PP_ON_DELAYS);
+	dev_priv->savePP_OFF_DELAYS = I915_READ(PP_OFF_DELAYS);
+	dev_priv->savePP_DIVISOR = I915_READ(PP_DIVISOR);
 
 	/* FIXME: save TV & SDVO state */
 
@@ -370,19 +365,19 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 	dev_priv->saveFBC_CONTROL = I915_READ(FBC_CONTROL);
 
 	/* Interrupt state */
-	dev_priv->saveIIR = I915_READ(I915REG_INT_IDENTITY_R);
-	dev_priv->saveIER = I915_READ(I915REG_INT_ENABLE_R);
-	dev_priv->saveIMR = I915_READ(I915REG_INT_MASK_R);
+	dev_priv->saveIIR = I915_READ(IIR);
+	dev_priv->saveIER = I915_READ(IER);
+	dev_priv->saveIMR = I915_READ(IMR);
 
 	/* VGA state */
-	dev_priv->saveVCLK_DIVISOR_VGA0 = I915_READ(VCLK_DIVISOR_VGA0);
-	dev_priv->saveVCLK_DIVISOR_VGA1 = I915_READ(VCLK_DIVISOR_VGA1);
-	dev_priv->saveVCLK_POST_DIV = I915_READ(VCLK_POST_DIV);
+	dev_priv->saveVGA0 = I915_READ(VGA0);
+	dev_priv->saveVGA1 = I915_READ(VGA1);
+	dev_priv->saveVGA_PD = I915_READ(VGA_PD);
 	dev_priv->saveVGACNTRL = I915_READ(VGACNTRL);
 
 	/* Clock gating state */
 	dev_priv->saveD_STATE = I915_READ(D_STATE);
-	dev_priv->saveDSPCLK_GATE_D = I915_READ(DSPCLK_GATE_D);
+	dev_priv->saveCG_2D_DIS = I915_READ(CG_2D_DIS);
 
 	/* Cache mode state */
 	dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
@@ -419,6 +414,8 @@ static int i915_resume(struct drm_device *dev)
 	if (pci_enable_device(dev->pdev))
 		return -1;
 
+	DRM_INFO("resuming i915\n");
+
 	pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
 
 	I915_WRITE(DSPARB, dev_priv->saveDSPARB);
@@ -452,7 +449,7 @@ static int i915_resume(struct drm_device *dev)
 	I915_WRITE(DSPASIZE, dev_priv->saveDSPASIZE);
 	I915_WRITE(DSPAPOS, dev_priv->saveDSPAPOS);
 	I915_WRITE(PIPEASRC, dev_priv->savePIPEASRC);
-	I915_WRITE(DSPABASE, dev_priv->saveDSPABASE);
+	I915_WRITE(DSPAADDR, dev_priv->saveDSPAADDR);
 	I915_WRITE(DSPASTRIDE, dev_priv->saveDSPASTRIDE);
 	if (IS_I965G(dev)) {
 		I915_WRITE(DSPASURF, dev_priv->saveDSPASURF);
@@ -464,10 +461,11 @@ static int i915_resume(struct drm_device *dev)
 	i915_restore_palette(dev, PIPE_A);
 	/* Enable the plane */
 	I915_WRITE(DSPACNTR, dev_priv->saveDSPACNTR);
-	I915_WRITE(DSPABASE, I915_READ(DSPABASE));
+	I915_WRITE(DSPAADDR, I915_READ(DSPAADDR));
 
 	/* Pipe & plane B info */
 	if (dev_priv->saveDPLL_B & DPLL_VCO_ENABLE) {
+		DRM_INFO("restoring DPLL_B: 0x%08x\n", dev_priv->saveDPLL_B);
 		I915_WRITE(DPLL_B, dev_priv->saveDPLL_B &
 			   ~DPLL_VCO_ENABLE);
 		udelay(150);
@@ -476,6 +474,7 @@ static int i915_resume(struct drm_device *dev)
 	I915_WRITE(FPB1, dev_priv->saveFPB1);
 	/* Actually enable it */
 	I915_WRITE(DPLL_B, dev_priv->saveDPLL_B);
+	DRM_INFO("restoring DPLL_B: 0x%08x\n", dev_priv->saveDPLL_B);
 	udelay(150);
 	if (IS_I965G(dev))
 		I915_WRITE(DPLL_B_MD, dev_priv->saveDPLL_B_MD);
@@ -494,7 +493,7 @@ static int i915_resume(struct drm_device *dev)
 	I915_WRITE(DSPBSIZE, dev_priv->saveDSPBSIZE);
 	I915_WRITE(DSPBPOS, dev_priv->saveDSPBPOS);
 	I915_WRITE(PIPEBSRC, dev_priv->savePIPEBSRC);
-	I915_WRITE(DSPBBASE, dev_priv->saveDSPBBASE);
+	I915_WRITE(DSPBADDR, dev_priv->saveDSPBADDR);
 	I915_WRITE(DSPBSTRIDE, dev_priv->saveDSPBSTRIDE);
 	if (IS_I965G(dev)) {
 		I915_WRITE(DSPBSURF, dev_priv->saveDSPBSURF);
@@ -506,7 +505,7 @@ static int i915_resume(struct drm_device *dev)
 	i915_restore_palette(dev, PIPE_B);
 	/* Enable the plane */
 	I915_WRITE(DSPBCNTR, dev_priv->saveDSPBCNTR);
-	I915_WRITE(DSPBBASE, I915_READ(DSPBBASE));
+	I915_WRITE(DSPBADDR, I915_READ(DSPBADDR));
 
 	/* CRT state */
 	I915_WRITE(ADPA, dev_priv->saveADPA);
@@ -521,9 +520,9 @@ static int i915_resume(struct drm_device *dev)
 
 	I915_WRITE(PFIT_PGM_RATIOS, dev_priv->savePFIT_PGM_RATIOS);
 	I915_WRITE(BLC_PWM_CTL, dev_priv->saveBLC_PWM_CTL);
-	I915_WRITE(LVDSPP_ON, dev_priv->saveLVDSPP_ON);
-	I915_WRITE(LVDSPP_OFF, dev_priv->saveLVDSPP_OFF);
-	I915_WRITE(PP_CYCLE, dev_priv->savePP_CYCLE);
+	I915_WRITE(PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS);
+	I915_WRITE(PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS);
+	I915_WRITE(PP_DIVISOR, dev_priv->savePP_DIVISOR);
 	I915_WRITE(PP_CONTROL, dev_priv->savePP_CONTROL);
 
 	/* FIXME: restore TV & SDVO state */
@@ -536,14 +535,14 @@ static int i915_resume(struct drm_device *dev)
 
 	/* VGA state */
 	I915_WRITE(VGACNTRL, dev_priv->saveVGACNTRL);
-	I915_WRITE(VCLK_DIVISOR_VGA0, dev_priv->saveVCLK_DIVISOR_VGA0);
-	I915_WRITE(VCLK_DIVISOR_VGA1, dev_priv->saveVCLK_DIVISOR_VGA1);
-	I915_WRITE(VCLK_POST_DIV, dev_priv->saveVCLK_POST_DIV);
+	I915_WRITE(VGA0, dev_priv->saveVGA0);
+	I915_WRITE(VGA1, dev_priv->saveVGA1);
+	I915_WRITE(VGA_PD, dev_priv->saveVGA_PD);
 	udelay(150);
 
 	/* Clock gating state */
 	I915_WRITE (D_STATE, dev_priv->saveD_STATE);
-	I915_WRITE (DSPCLK_GATE_D, dev_priv->saveDSPCLK_GATE_D);
+	I915_WRITE (CG_2D_DIS, dev_priv->saveCG_2D_DIS);
 
 	/* Cache mode state */
 	I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);
-- 
cgit v1.2.3


From 9fc4ea5c00dfb91ebff893fb5092e768155cc2e2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Fri, 23 May 2008 18:42:47 -0700
Subject: i915: do a better job of parsing VBIOS data

Add code to get panel modes from the VBIOS if present and check whether certain
outputs exist.  Should make our display detection code a little more robust.
---
 linux-core/i915_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 27c239d0..51262d79 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -387,7 +387,7 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 
 	/* Scratch space */
 	for (i = 0; i < 16; i++) {
-		dev_priv->saveSWF0[i] = I915_READ(SWF0 + (i << 2));
+		dev_priv->saveSWF0[i] = I915_READ(SWF00 + (i << 2));
 		dev_priv->saveSWF1[i] = I915_READ(SWF10 + (i << 2));
 	}
 	for (i = 0; i < 3; i++)
@@ -551,7 +551,7 @@ static int i915_resume(struct drm_device *dev)
 	I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000);
 
 	for (i = 0; i < 16; i++) {
-		I915_WRITE(SWF0 + (i << 2), dev_priv->saveSWF0[i]);
+		I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);
 		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
 	}
 	for (i = 0; i < 3; i++)
-- 
cgit v1.2.3


From 76a44f14d6339e5bc0c936ef4a360f6c152511bd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 11:59:28 +1000
Subject: drm/modesetting: overhaul the fb create/delete.

Move TTM code into the driver
---
 linux-core/i915_drv.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 51262d79..2aac4926 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -589,7 +589,6 @@ static struct drm_driver driver = {
 	.get_map_ofs = drm_core_get_map_ofs,
 	.get_reg_ofs = drm_core_get_reg_ofs,
 	.fb_probe = intelfb_probe,
-	.fb_remove = intelfb_remove,
 	.fb_resize = intelfb_resize,
 	.master_create = i915_master_create,
 	.master_destroy = i915_master_destroy,
-- 
cgit v1.2.3


From 967bd219116a4f20aec828b890a225d2f92afd0b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 11:11:22 +1000
Subject: modesetting: initial attempt at debonging fb

---
 linux-core/i915_drv.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 2aac4926..b81db3a6 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -42,6 +42,12 @@ static struct pci_device_id pciidlist[] = {
 unsigned int i915_modeset = 0;
 module_param_named(modeset, i915_modeset, int, 0400);
 
+unsigned int i915_fbpercrtc = 1;
+module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
+
+unsigned int i915_rightof = 1;
+module_param_named(i915_rightof, i915_rightof, int, 0400);
+
 #ifdef I915_HAVE_FENCE
 extern struct drm_fence_driver i915_fence_driver;
 #endif
-- 
cgit v1.2.3


From f73e54bbf0b97a8f5184ede64d4f263020d623ee Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 13:40:08 +1000
Subject: drm: modesetting unify the hotplug init paths a lot.

remove fb callbacks, just probe into the driver to sort it out
---
 linux-core/i915_drv.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index b81db3a6..f4c50752 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -594,8 +594,6 @@ static struct drm_driver driver = {
 	.reclaim_buffers = drm_core_reclaim_buffers,
 	.get_map_ofs = drm_core_get_map_ofs,
 	.get_reg_ofs = drm_core_get_reg_ofs,
-	.fb_probe = intelfb_probe,
-	.fb_resize = intelfb_resize,
 	.master_create = i915_master_create,
 	.master_destroy = i915_master_destroy,
 	.ioctls = i915_ioctls,
-- 
cgit v1.2.3


From b31adb005afc5553fb30aa2c1710faee299bc730 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 15:55:03 +1000
Subject: drm/modesetting: more fb interface cleanups

---
 linux-core/i915_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index f4c50752..f755dcd4 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -42,7 +42,7 @@ static struct pci_device_id pciidlist[] = {
 unsigned int i915_modeset = 0;
 module_param_named(modeset, i915_modeset, int, 0400);
 
-unsigned int i915_fbpercrtc = 1;
+unsigned int i915_fbpercrtc = 0;
 module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 
 unsigned int i915_rightof = 1;
-- 
cgit v1.2.3


From 4a2e29bf9982165deeeabb5c585fc0a8a659f380 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed, 11 Jun 2008 15:59:01 -0700
Subject: Use GEM in modesetting

Use GEM for ring buffer setup and framebuffer allocation.  This means reworking
the hardware status page stuff a bit (just use the basic range allocator for
vram for now) and #ifdef'ing out the TTM & DRI2 code.  Works well enough to
load/unload several times and display fbcon on my T61 (though there's still
some unexplained console corruption).
---
 linux-core/i915_drv.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 8718bd10..574282b2 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -48,11 +48,11 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 unsigned int i915_rightof = 1;
 module_param_named(i915_rightof, i915_rightof, int, 0400);
 
-#ifdef I915_HAVE_FENCE
+#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
 extern struct drm_fence_driver i915_fence_driver;
 #endif
 
-#ifdef I915_HAVE_BUFFER
+#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
 
 static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
 static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
@@ -71,7 +71,7 @@ static struct drm_bo_driver i915_bo_driver = {
 	.ttm_cache_flush = i915_flush_ttm,
 	.command_stream_barrier = NULL,
 };
-#endif
+#endif /* ttm */
 
 static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 {
@@ -619,10 +619,10 @@ static struct drm_driver driver = {
 		.probe = probe,
 		.remove = __devexit_p(drm_cleanup_pci),
 		},
-#ifdef I915_HAVE_FENCE
+#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
 	.fence_driver = &i915_fence_driver,
 #endif
-#ifdef I915_HAVE_BUFFER
+#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
 	.bo_driver = &i915_bo_driver,
 #endif
 	.name = DRIVER_NAME,
-- 
cgit v1.2.3


From 57b8837b4eb3b4972390680ad8042cd6920bf003 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed, 18 Jun 2008 15:31:48 -0700
Subject: i915: cleanup PCI state before disabling MSI

Core MSI code will BUG() if an interrupt handler is still registered when
pci_disable_msi() is called.
---
 linux-core/i915_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 1817c964..2b8ee774 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -656,9 +656,9 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 static void remove(struct pci_dev *pdev)
 {
+	drm_cleanup_pci(pdev);
 	if (pdev->msi_enabled)
 		pci_disable_msi(pdev);
-	drm_cleanup_pci(pdev);
 }
 
 static int __init i915_init(void)
-- 
cgit v1.2.3


From a2adc696569de830c7a95722dd111bff706a0bbc Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat, 16 Aug 2008 12:09:24 -0700
Subject: i915: finish removing TTM bits

Makes it build again.
---
 linux-core/i915_drv.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 2e67eb71..38859474 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -48,31 +48,6 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 unsigned int i915_rightof = 1;
 module_param_named(i915_rightof, i915_rightof, int, 0400);
 
-#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
-extern struct drm_fence_driver i915_fence_driver;
-#endif
-
-#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
-
-static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
-static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
-
-static struct drm_bo_driver i915_bo_driver = {
-	.mem_type_prio = i915_mem_prios,
-	.mem_busy_prio = i915_busy_prios,
-	.num_mem_type_prio = sizeof(i915_mem_prios)/sizeof(uint32_t),
-	.num_mem_busy_prio = sizeof(i915_busy_prios)/sizeof(uint32_t),
-	.create_ttm_backend_entry = i915_create_ttm_backend_entry,
-	.fence_type = i915_fence_type,
-	.invalidate_caches = i915_invalidate_caches,
-	.init_mem_type = i915_init_mem_type,
-	.evict_flags = i915_evict_flags,
-	.move = i915_move,
-	.ttm_cache_flush = i915_flush_ttm,
-	.command_stream_barrier = NULL,
-};
-#endif /* ttm */
-
 static int i915_suspend(struct drm_device *dev, pm_message_t state)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -175,12 +150,6 @@ static struct drm_driver driver = {
 		.probe = probe,
 		.remove = remove,
 		},
-#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
-	.fence_driver = &i915_fence_driver,
-#endif
-#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
-	.bo_driver = &i915_bo_driver,
-#endif
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = DRIVER_DATE,
-- 
cgit v1.2.3