[PATCH 1/3] gma500: Fix comment mispelling in cdv_intel_limits definition.

[PATCH 1/3] gma500: Fix comment mispelling in cdv_intel_limits definition.

[Forest Bond]

From: Forest Bond <forest.bond@rapidrollout.com>

Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
---
 drivers/gpu/drm/gma500/cdv_intel_display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index a68509b..883a9f3 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -65,7 +65,7 @@ struct cdv_intel_limit_t {
 #define CDV_LIMIT_DAC_HDMI_96		3
 
 static const struct cdv_intel_limit_t cdv_intel_limits[] = {
-	{			/* CDV_SIGNLE_LVDS_96MHz */
+	{			/* CDV_SINGLE_LVDS_96MHz */
 	 .dot = {.min = 20000, .max = 115500},
 	 .vco = {.min = 1800000, .max = 3600000},
 	 .n = {.min = 2, .max = 6},
-- 
1.7.0.4

[PATCH 2/3] gma: psb_intel_crtc: Drop crtc_enable flag.

[Forest Bond]

From: Forest Bond <forest.bond@rapidrollout.com>

This is set when setting DPMS on and off, but it isn't checked anywhere,
so just remove it.

Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
---
 drivers/gpu/drm/gma500/cdv_intel_display.c |    2 --
 drivers/gpu/drm/gma500/psb_intel_drv.h     |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 883a9f3..2100aff 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -841,7 +841,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 		/* Give the overlay scaler a chance to enable
 		 * if it's on this pipe */
 		/* psb_intel_crtc_dpms_video(crtc, true); TODO */
-		psb_intel_crtc->crtc_enable = true;
 		break;
 	case DRM_MODE_DPMS_OFF:
 		if (!psb_intel_crtc->active)
@@ -893,7 +892,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 		/* Wait for the clocks to turn off. */
 		udelay(150);
 		cdv_intel_update_watermark(dev, crtc);
-		psb_intel_crtc->crtc_enable = false;
 		break;
 	}
 	/*Set FIFO Watermarks*/
diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h
index ebe1a28..e179c36 100644
--- a/drivers/gpu/drm/gma500/psb_intel_drv.h
+++ b/drivers/gpu/drm/gma500/psb_intel_drv.h
@@ -190,7 +190,6 @@ struct psb_intel_crtc {
 	u32 mode_flags;
 
 	bool active;
-	bool crtc_enable;
 
 	/* Saved Crtc HW states */
 	struct psb_intel_crtc_state *crtc_state;
-- 
1.7.0.4

[PATCH 3/3] gma500: Consider CRTC initially active.

[Forest Bond]

From: Forest Bond <forest.bond@rapidrollout.com>

This causes the pipe to be forced off prior to initial mode set, which
roughly mirrors the behavior of the i915 driver.  It fixes initial mode
setting on my Intel DN2800MT (Cedarview) board.  Without it, mode
setting triggers an out-of-range error from the monitor for most modes,
but only on initial configuration (i.e. they can be configured
successfully from userspace after that).

Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
---
 drivers/gpu/drm/gma500/psb_intel_display.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 30dc22a..8033526 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -1362,6 +1362,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
 	    (struct drm_connector **) (psb_intel_crtc + 1);
 	psb_intel_crtc->mode_set.num_connectors = 0;
 	psb_intel_cursor_init(dev, psb_intel_crtc);
+
+	/* Set to true so that the pipe is forced off on initial config. */
+	psb_intel_crtc->active = true;
 }
 
 int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-- 
1.7.0.4

Re: [PATCH 2/3] gma: psb_intel_crtc: Drop crtc_enable flag.

[Forest Bond]

[-- Attachment #1.1: Type: text/plain, Size: 263 bytes --]

Hi,

> Subject: Re: [PATCH 2/3] gma: psb_intel_crtc: Drop crtc_enable flag.

So obviously this should have read "gma500: ..."  Let me know if I should
resend.

Thanks,
Forest
-- 
Forest Bond
http://www.alittletooquiet.net
http://www.rapidrollout.com

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/3] gma: psb_intel_crtc: Drop crtc_enable flag.

[Alan Cox]

On Sun, 12 Aug 2012 10:04:47 -0400
Forest Bond <forest@alittletooquiet.net> wrote:

> Hi,
> 
> > Subject: Re: [PATCH 2/3] gma: psb_intel_crtc: Drop crtc_enable flag.
> 
> So obviously this should have read "gma500: ..."  Let me know if I should
> resend.

No need. I'll pick these up and test them on the problem board here as
well.

Alan