drm/i915: Set the multiplier for SDVO on G33 platform
diff mbox

Message ID 1249551400-8309-1-git-send-email-yakui.zhao@intel.com
State Accepted
Headers show

Commit Message

Zhao, Yakui Aug. 6, 2009, 9:36 a.m. UTC
From: Sean Young <sean@mess.org>

Set the multiplier correctly for SDVO on G33 platform

http://bugs.freedesktop.org/show_bug.cgi?id=21417

Signed-off-by: Sean Young <sean@mess.org>
reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Zhenyu Wang Aug. 7, 2009, 10:12 a.m. UTC | #1
On 2009.08.06 17:36:40 +0800, yakui.zhao@intel.com wrote:
> From: Sean Young <sean@mess.org>
> 
> Set the multiplier correctly for SDVO on G33 platform
> 
> http://bugs.freedesktop.org/show_bug.cgi?id=21417
> 
> Signed-off-by: Sean Young <sean@mess.org>
> reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/drivers/gpu/drm/i915/intel_display.c
> ===================================================================
> --- linux-2.6.orig/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:27:25.000000000 +0800
> +++ linux-2.6/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:30:15.000000000 +0800
> @@ -2396,7 +2396,7 @@
>  		if (is_sdvo) {
>  			dpll |= DPLL_DVO_HIGH_SPEED;
>  			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
> -			if (IS_I945G(dev) || IS_I945GM(dev))
> +			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
>  				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
>  			else if (IS_IGDNG(dev))
>  				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;

Seems a missing sync from ums to kms. Thanks!

Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Zhao, Yakui Aug. 13, 2009, 1:43 a.m. UTC | #2
On Fri, 2009-08-07 at 18:12 +0800, Zhenyu Wang wrote:
> On 2009.08.06 17:36:40 +0800, yakui.zhao@intel.com wrote:
> > From: Sean Young <sean@mess.org>
> > 
> > Set the multiplier correctly for SDVO on G33 platform
> > 
> > http://bugs.freedesktop.org/show_bug.cgi?id=21417
> > 
> > Signed-off-by: Sean Young <sean@mess.org>
> > reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > Index: linux-2.6/drivers/gpu/drm/i915/intel_display.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:27:25.000000000 +0800
> > +++ linux-2.6/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:30:15.000000000 +0800
> > @@ -2396,7 +2396,7 @@
> >  		if (is_sdvo) {
> >  			dpll |= DPLL_DVO_HIGH_SPEED;
> >  			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
> > -			if (IS_I945G(dev) || IS_I945GM(dev))
> > +			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
> >  				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
> >  			else if (IS_IGDNG(dev))
> >  				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
> 
> Seems a missing sync from ums to kms. Thanks!
Right.

Hi, Eric
   Will you please pick up this patch?
   Otherwise the SDVO can't work well on G33 platform with KMS enabled.
   
thanks.
> 
> Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>
>
Zhao, Yakui Aug. 25, 2009, 8:11 a.m. UTC | #3
On Tue, 2009-08-25 at 07:51 +0800, Eric Anholt wrote:
> On Thu, 2009-08-13 at 12:04 +0000, Sean Young wrote:
> > On Thu, Aug 13, 2009 at 09:43:08AM +0800, ykzhao wrote:
> > > On Fri, 2009-08-07 at 18:12 +0800, Zhenyu Wang wrote:
> > > > On 2009.08.06 17:36:40 +0800, yakui.zhao@intel.com wrote:
> > > > > From: Sean Young <sean@mess.org>
> > > > > 
> > > > > Set the multiplier correctly for SDVO on G33 platform
> > > > > 
> > > > > http://bugs.freedesktop.org/show_bug.cgi?id=21417
> > > > > 
> > > > > Signed-off-by: Sean Young <sean@mess.org>
> > > > > reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
> > > > > ---
> > > > >  drivers/gpu/drm/i915/intel_display.c |    2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > 
> > > > > Index: linux-2.6/drivers/gpu/drm/i915/intel_display.c
> > > > > ===================================================================
> > > > > --- linux-2.6.orig/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:27:25.000000000 +0800
> > > > > +++ linux-2.6/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:30:15.000000000 +0800
> > > > > @@ -2396,7 +2396,7 @@
> > > > >  		if (is_sdvo) {
> > > > >  			dpll |= DPLL_DVO_HIGH_SPEED;
> > > > >  			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
> > > > > -			if (IS_I945G(dev) || IS_I945GM(dev))
> > > > > +			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
> > > > >  				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
> > > > >  			else if (IS_IGDNG(dev))
> > > > >  				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
> > > > 
> > > > Seems a missing sync from ums to kms. Thanks!
> > > Right.
> > > 
> > > Hi, Eric
> > >    Will you please pick up this patch?
> > >    Otherwise the SDVO can't work well on G33 platform with KMS enabled.
> > 
> > Just confirm that I've been running with this patch for some time and I 
> > have not encountered any problems. All resolutions work with the VGA and 
> > DVI connector.
> > 
> > It would be great to have this patch merged.
> > 
> > Signed-off-by: Sean Young <sean@mess.org>
> > Tested-by: Sean Young <sean@mess.org>
> 
> I've been busy up in userland, sorry.  Applied.
Hi, Eric
    Will you please also pick up the patch related with TV property in
this patch set?
    One is to set the TV_format based on connector type(integrated TV)
    The other three patches are to add the property for SDVO-TV(LVDS).

thanks.
>
Eric Anholt Aug. 25, 2009, 2:50 p.m. UTC | #4
On Tue, 2009-08-25 at 16:11 +0800, ykzhao wrote:
> On Tue, 2009-08-25 at 07:51 +0800, Eric Anholt wrote:
> > On Thu, 2009-08-13 at 12:04 +0000, Sean Young wrote:
> > > On Thu, Aug 13, 2009 at 09:43:08AM +0800, ykzhao wrote:
> > > > On Fri, 2009-08-07 at 18:12 +0800, Zhenyu Wang wrote:
> > > > > On 2009.08.06 17:36:40 +0800, yakui.zhao@intel.com wrote:
> > > > > > From: Sean Young <sean@mess.org>
> > > > > > 
> > > > > > Set the multiplier correctly for SDVO on G33 platform
> > > > > > 
> > > > > > http://bugs.freedesktop.org/show_bug.cgi?id=21417
> > > > > > 
> > > > > > Signed-off-by: Sean Young <sean@mess.org>
> > > > > > reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
> > > > > > ---
> > > > > >  drivers/gpu/drm/i915/intel_display.c |    2 +-
> > > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > > 
> > > > > > Index: linux-2.6/drivers/gpu/drm/i915/intel_display.c
> > > > > > ===================================================================
> > > > > > --- linux-2.6.orig/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:27:25.000000000 +0800
> > > > > > +++ linux-2.6/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:30:15.000000000 +0800
> > > > > > @@ -2396,7 +2396,7 @@
> > > > > >  		if (is_sdvo) {
> > > > > >  			dpll |= DPLL_DVO_HIGH_SPEED;
> > > > > >  			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
> > > > > > -			if (IS_I945G(dev) || IS_I945GM(dev))
> > > > > > +			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
> > > > > >  				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
> > > > > >  			else if (IS_IGDNG(dev))
> > > > > >  				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
> > > > > 
> > > > > Seems a missing sync from ums to kms. Thanks!
> > > > Right.
> > > > 
> > > > Hi, Eric
> > > >    Will you please pick up this patch?
> > > >    Otherwise the SDVO can't work well on G33 platform with KMS enabled.
> > > 
> > > Just confirm that I've been running with this patch for some time and I 
> > > have not encountered any problems. All resolutions work with the VGA and 
> > > DVI connector.
> > > 
> > > It would be great to have this patch merged.
> > > 
> > > Signed-off-by: Sean Young <sean@mess.org>
> > > Tested-by: Sean Young <sean@mess.org>
> > 
> > I've been busy up in userland, sorry.  Applied.
> Hi, Eric
>     Will you please also pick up the patch related with TV property in
> this patch set?
>     One is to set the TV_format based on connector type(integrated TV)
>     The other three patches are to add the property for SDVO-TV(LVDS).

No, that's not suitable at this point in the release cycle, and I'm
waiting for a couple of major patches for applying before I do the small
ones for -next.

Patch
diff mbox

Index: linux-2.6/drivers/gpu/drm/i915/intel_display.c
===================================================================
--- linux-2.6.orig/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:27:25.000000000 +0800
+++ linux-2.6/drivers/gpu/drm/i915/intel_display.c	2009-08-06 17:30:15.000000000 +0800
@@ -2396,7 +2396,7 @@ 
 		if (is_sdvo) {
 			dpll |= DPLL_DVO_HIGH_SPEED;
 			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
-			if (IS_I945G(dev) || IS_I945GM(dev))
+			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
 				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
 			else if (IS_IGDNG(dev))
 				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;