Attachment 77569 Details for Bug 58527 – gma500 kernel patch

[patch] gma500 kernel patch

gma500.patch (text/plain), 7.70 KB, created by nucleo on 2013-04-08 01:48:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nucleo

Created: 2013-04-08 01:48:04 UTC

Size: 7.70 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
>index 2590cac..31ac392 100644
>--- a/drivers/gpu/drm/gma500/framebuffer.c
>+++ b/drivers/gpu/drm/gma500/framebuffer.c
>@@ -431,7 +431,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
> 	fbdev->psb_fb_helper.fbdev = info;
> 
> 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
>-	strcpy(info->fix.id, "psbfb");
>+	strcpy(info->fix.id, "psbdrmfb");
> 
> 	info->flags = FBINFO_DEFAULT;
> 	if (dev_priv->ops->accel_2d && pitch_lines > 8)	/* 2D engine */
>diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
>index 04a371a..2f12faf 100644
>--- a/drivers/gpu/drm/gma500/gtt.c
>+++ b/drivers/gpu/drm/gma500/gtt.c
>@@ -80,7 +80,8 @@ static u32 __iomem *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
>  *	the GTT. This is protected via the gtt mutex which the caller
>  *	must hold.
>  */
>-static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
>+static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r,
>+			  int resume)
> {
> 	u32 __iomem *gtt_slot;
> 	u32 pte;
>@@ -97,8 +98,10 @@ static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
> 	gtt_slot = psb_gtt_entry(dev, r);
> 	pages = r->pages;
> 
>-	/* Make sure changes are visible to the GPU */
>-	set_pages_array_wc(pages, r->npage);
>+	if (!resume) {
>+		/* Make sure changes are visible to the GPU */
>+		set_pages_array_wc(pages, r->npage);
>+	}
> 
> 	/* Write our page entries into the GTT itself */
> 	for (i = r->roll; i < r->npage; i++) {
>@@ -269,7 +272,7 @@ int psb_gtt_pin(struct gtt_range *gt)
> 		ret = psb_gtt_attach_pages(gt);
> 		if (ret < 0)
> 			goto out;
>-		ret = psb_gtt_insert(dev, gt);
>+		ret = psb_gtt_insert(dev, gt, 0);
> 		if (ret < 0) {
> 			psb_gtt_detach_pages(gt);
> 			goto out;
>@@ -421,9 +424,11 @@ int psb_gtt_init(struct drm_device *dev, int resume)
> 	int ret = 0;
> 	uint32_t pte;
> 
>-	mutex_init(&dev_priv->gtt_mutex);
>+	if (!resume) {
>+		mutex_init(&dev_priv->gtt_mutex);
>+		psb_gtt_alloc(dev);
>+	}
> 
>-	psb_gtt_alloc(dev);
> 	pg = &dev_priv->gtt;
> 
> 	/* Enable the GTT */
>@@ -505,7 +510,8 @@ int psb_gtt_init(struct drm_device *dev, int resume)
> 	/*
> 	 *	Map the GTT and the stolen memory area
> 	 */
>-	dev_priv->gtt_map = ioremap_nocache(pg->gtt_phys_start,
>+	if (!resume)
>+		dev_priv->gtt_map = ioremap_nocache(pg->gtt_phys_start,
> 						gtt_pages << PAGE_SHIFT);
> 	if (!dev_priv->gtt_map) {
> 		dev_err(dev->dev, "Failure to map gtt.\n");
>@@ -513,7 +519,9 @@ int psb_gtt_init(struct drm_device *dev, int resume)
> 		goto out_err;
> 	}
> 
>-	dev_priv->vram_addr = ioremap_wc(dev_priv->stolen_base, stolen_size);
>+	if (!resume)
>+		dev_priv->vram_addr = ioremap_wc(dev_priv->stolen_base,
>+						 stolen_size);
> 	if (!dev_priv->vram_addr) {
> 		dev_err(dev->dev, "Failure to map stolen base.\n");
> 		ret = -ENOMEM;
>@@ -549,3 +557,24 @@ out_err:
> 	psb_gtt_takedown(dev);
> 	return ret;
> }
>+
>+int psb_gtt_restore(struct drm_device *dev)
>+{
>+	struct drm_psb_private *dev_priv = dev->dev_private;
>+	struct resource *r = dev_priv->gtt_mem->child;
>+	struct gtt_range *range;
>+
>+	/* On resume, the gtt_mutex is already initialized */
>+	mutex_lock(&dev_priv->gtt_mutex);
>+	psb_gtt_init(dev, 1);
>+
>+	while (r != NULL) {
>+		range = container_of(r, struct gtt_range, resource);
>+		if (range->pages)
>+			psb_gtt_insert(dev, range, 1);
>+		r = r->sibling;
>+	}
>+	mutex_unlock(&dev_priv->gtt_mutex);
>+
>+	return 0;
>+}
>diff --git a/drivers/gpu/drm/gma500/gtt.h b/drivers/gpu/drm/gma500/gtt.h
>index aa17423..6191d10 100644
>--- a/drivers/gpu/drm/gma500/gtt.h
>+++ b/drivers/gpu/drm/gma500/gtt.h
>@@ -60,5 +60,5 @@ extern int psb_gtt_pin(struct gtt_range *gt);
> extern void psb_gtt_unpin(struct gtt_range *gt);
> extern void psb_gtt_roll(struct drm_device *dev,
> 					struct gtt_range *gt, int roll);
>-
>+extern int psb_gtt_restore(struct drm_device *dev);
> #endif
>diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c
>index 889b854..b6b135f 100644
>--- a/drivers/gpu/drm/gma500/power.c
>+++ b/drivers/gpu/drm/gma500/power.c
>@@ -110,6 +110,8 @@ static void gma_resume_display(struct pci_dev *pdev)
> 	PSB_WVDC32(dev_priv->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
> 	pci_write_config_word(pdev, PSB_GMCH_CTRL,
> 			dev_priv->gmch_ctrl | _PSB_GMCH_ENABLED);
>+
>+	psb_gtt_restore(dev); /* Rebuild our GTT mappings */
> 	dev_priv->ops->restore_regs(dev);
> }
> 
>@@ -313,3 +315,18 @@ int psb_runtime_idle(struct device *dev)
> 	else
> 		return 1;
> }
>+
>+int gma_power_thaw(struct device *_dev)
>+{
>+	return gma_power_resume(_dev);
>+}
>+
>+int gma_power_freeze(struct device *_dev)
>+{
>+	return gma_power_suspend(_dev);
>+}
>+
>+int gma_power_restore(struct device *_dev)
>+{
>+	return gma_power_resume(_dev);
>+}
>diff --git a/drivers/gpu/drm/gma500/power.h b/drivers/gpu/drm/gma500/power.h
>index 1969d2e..56d8708 100644
>--- a/drivers/gpu/drm/gma500/power.h
>+++ b/drivers/gpu/drm/gma500/power.h
>@@ -41,6 +41,9 @@ void gma_power_uninit(struct drm_device *dev);
>  */
> int gma_power_suspend(struct device *dev);
> int gma_power_resume(struct device *dev);
>+int gma_power_thaw(struct device *dev);
>+int gma_power_freeze(struct device *dev);
>+int gma_power_restore(struct device *_dev);
> 
> /*
>  * These are the functions the driver should use to wrap all hw access
>diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
>index 111e3df..bddea58 100644
>--- a/drivers/gpu/drm/gma500/psb_drv.c
>+++ b/drivers/gpu/drm/gma500/psb_drv.c
>@@ -601,6 +601,9 @@ static void psb_remove(struct pci_dev *pdev)
> static const struct dev_pm_ops psb_pm_ops = {
> 	.resume = gma_power_resume,
> 	.suspend = gma_power_suspend,
>+	.thaw = gma_power_thaw,
>+	.freeze = gma_power_freeze,
>+	.restore = gma_power_restore,
> 	.runtime_suspend = psb_runtime_suspend,
> 	.runtime_resume = psb_runtime_resume,
> 	.runtime_idle = psb_runtime_idle,
>diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
>index a4cc777a..cd1b407 100644
>--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
>+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
>@@ -134,6 +134,9 @@ struct psb_intel_sdvo {
> 
> 	/* Input timings for adjusted_mode */
> 	struct psb_intel_sdvo_dtd input_dtd;
>+
>+	/* Saved SDVO output states */
>+	uint32_t saveSDVO; /* Can be SDVOB or SDVOC depending on sdvo_reg */
> };
> 
> struct psb_intel_sdvo_connector {
>@@ -1830,6 +1833,35 @@ done:
> #undef CHECK_PROPERTY
> }
> 
>+static void psb_intel_sdvo_save(struct drm_connector *connector)
>+{
>+	struct drm_device *dev = connector->dev;
>+	struct psb_intel_encoder *psb_intel_encoder =
>+					psb_intel_attached_encoder(connector);
>+	struct psb_intel_sdvo *sdvo =
>+				to_psb_intel_sdvo(&psb_intel_encoder->base);
>+
>+	sdvo->saveSDVO = REG_READ(sdvo->sdvo_reg);
>+}
>+
>+static void psb_intel_sdvo_restore(struct drm_connector *connector)
>+{
>+	struct drm_device *dev = connector->dev;
>+	struct drm_encoder *encoder =
>+				&psb_intel_attached_encoder(connector)->base;
>+	struct psb_intel_sdvo *sdvo = to_psb_intel_sdvo(encoder);
>+	struct drm_crtc *crtc = encoder->crtc;
>+
>+	REG_WRITE(sdvo->sdvo_reg, sdvo->saveSDVO);
>+
>+	/* Force dpms on upon resume */
>+	psb_intel_sdvo_dpms(encoder, DRM_MODE_DPMS_ON);
>+
>+	/* Force a full mode set on the crtc. We're supposed to have the
>+	   mode_config lock already. */
>+	drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, NULL);
>+}
>+
> static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
> 	.dpms = psb_intel_sdvo_dpms,
> 	.mode_fixup = psb_intel_sdvo_mode_fixup,
>@@ -1840,6 +1872,8 @@ static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
> 
> static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
> 	.dpms = drm_helper_connector_dpms,
>+	.save = psb_intel_sdvo_save,
>+	.restore = psb_intel_sdvo_restore,
> 	.detect = psb_intel_sdvo_detect,
> 	.fill_modes = drm_helper_probe_single_connector_modes,
> 	.set_property = psb_intel_sdvo_set_property,

Actions: View | Splinter Review

Attachments on bug 58527: 71813 | 77569 | 78045 | 78078

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.