Skip to contentSkip to conversation

drm, gma500: Fix Cedarview boot failures in 3.3-rc

PATCH In review Alan Cox 3 participants 3 messages Mar 5, 2012

Subsystems (3)
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 drm, gma500: Fix Cedarview boot failures in 3.3-rc

From: Alan Cox <[email protected]>

[Resending with correct address for Linus]

Production GMA3600/3650 hardware turns out to be subtly different to the development platforms. This combined with a minor driver bug is causing the kernel to hang on these platforms.

This patch does the following

- turn down a couple of messages that were meant to be debug and are causing much confusion

- ensure the hotplug interrupt is disabled on Cedartrail systems.

- fix a bug where gtt roll mode called psbfb_sync, which tries to sync the 2D engine. On other devices it is harmless as the 2D engine is present but not in use when in gtt roll mode, on Cedartrail it causes a hang

Without these changes 3.3-rc hangs on boot on Cedartrail based systems.

---

 drivers/gpu/drm/gma500/cdv_device.c  |    2 ++
 drivers/gpu/drm/gma500/framebuffer.c |    1 -
 drivers/gpu/drm/gma500/gtt.c         |    9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/gma500/cdv_device.c +2 -0
index 4a5b099..53404af 100644
@@ -321,6 +321,8 @@ static int cdv_chip_setup(struct drm_device *dev)
 	cdv_get_core_freq(dev);
 	gma_intel_opregion_init(dev);
 	psb_intel_init_bios(dev);
+	REG_WRITE(PORT_HOTPLUG_EN, 0);
+	REG_WRITE(PORT_HOTPLUG_STAT, REG_READ(PORT_HOTPLUG_STAT));
 	return 0;
 }
 
drivers/gpu/drm/gma500/framebuffer.c +0 -1
index 830dfdd6b..be61673 100644
@@ -247,7 +247,6 @@ static struct fb_ops psbfb_roll_ops = {
 	.fb_imageblit = cfb_imageblit,
 	.fb_pan_display = psbfb_pan,
 	.fb_mmap = psbfb_mmap,
-	.fb_sync = psbfb_sync,
 	.fb_ioctl = psbfb_ioctl,
 };
 
drivers/gpu/drm/gma500/gtt.c +4 -5
index 5d5330f..aff194f 100644
@@ -446,10 +446,9 @@ int psb_gtt_init(struct drm_device *dev, int resume)
 	pg->gtt_start = pci_resource_start(dev->pdev, PSB_GTT_RESOURCE);
 	gtt_pages = pci_resource_len(dev->pdev, PSB_GTT_RESOURCE)
 								>> PAGE_SHIFT;
-	/* Some CDV firmware doesn't report this currently. In which case the
-	   system has 64 gtt pages */
+	/* CDV doesn't report this. In which case the system has 64 gtt pages */
 	if (pg->gtt_start == 0 || gtt_pages == 0) {
-		dev_err(dev->dev, "GTT PCI BAR not initialized.\n");
+		dev_dbg(dev->dev, "GTT PCI BAR not initialized.\n");
 		gtt_pages = 64;
 		pg->gtt_start = dev_priv->pge_ctl;
 	}
@@ -461,10 +460,10 @@ int psb_gtt_init(struct drm_device *dev, int resume)
 
 	if (pg->gatt_pages == 0 || pg->gatt_start == 0) {
 		static struct resource fudge;	/* Preferably peppermint */
-		/* This can occur on CDV SDV systems. Fudge it in this case.
+		/* This can occur on CDV systems. Fudge it in this case.
 		   We really don't care what imaginary space is being allocated
 		   at this point */
-		dev_err(dev->dev, "GATT PCI BAR not initialized.\n");
+		dev_dbg(dev->dev, "GATT PCI BAR not initialized.\n");
 		pg->gatt_start = 0x40000000;
 		pg->gatt_pages = (128 * 1024 * 1024) >> PAGE_SHIFT;
 		/* This is a little confusing but in fact the GTT is providing
#1 lore raw
Quoted 3 lines · Alan Cox

From: Alan Cox <[email protected]>

[Resending with correct address for Linus]

Should I take this directly, or is there a pending DRM pull that will contain this?

Linus

#2 lore raw

----- Original Message -----

Quoted 6 lines

From: "Linus Torvalds" <[email protected]>
To: "Alan Cox" <[email protected]>
Cc: [email protected]
Sent: Monday, 5 March, 2012 4:50:14 PM
Subject: Re: [PATCH] drm, gma500: Fix Cedarview boot failures in 3.3-rc

Quoted 8 lines
Quoted 3 lines · Alan Cox

From: Alan Cox <[email protected]>

[Resending with correct address for Linus]

Should I take this directly, or is there a pending DRM pull that will contain this?

I've just queued it up in drm-fixes, will send it out now since nothing else came in today.

Dave.