public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: change CHV write_eld/global_resources function pointers
@ 2014-09-02 19:53 Paulo Zanoni
  2014-09-03  8:52 ` Ville Syrjälä
  0 siblings, 1 reply; 3+ messages in thread
From: Paulo Zanoni @ 2014-09-02 19:53 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Currently, CHV is using the same functions as HSW/BDW instead of the
same functions as VLV. This looks wrong, especially since, for
example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW
check.

This patch has the potential to fix display audio and the CHV CDCLK.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


This is completely untested! But maybe it should go to fixes/stable.


diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c092ff4..e6cae59 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
 		dev_priv->display.write_eld = ironlake_write_eld;
 		dev_priv->display.modeset_global_resources =
 			ivb_modeset_global_resources;
-	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
+	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
 		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
 		dev_priv->display.write_eld = haswell_write_eld;
 		dev_priv->display.modeset_global_resources =
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: change CHV write_eld/global_resources function pointers
  2014-09-02 19:53 [PATCH] drm/i915: change CHV write_eld/global_resources function pointers Paulo Zanoni
@ 2014-09-03  8:52 ` Ville Syrjälä
  2014-09-03  9:01   ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Ville Syrjälä @ 2014-09-03  8:52 UTC (permalink / raw)
  To: Paulo Zanoni; +Cc: intel-gfx, Paulo Zanoni

On Tue, Sep 02, 2014 at 04:53:57PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Currently, CHV is using the same functions as HSW/BDW instead of the
> same functions as VLV. This looks wrong, especially since, for
> example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW
> check.
> 
> This patch has the potential to fix display audio and the CHV CDCLK.
> 
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Whoops. These things seem to slip through a lot. I can imediately
spot another IS_GEN8 fumble with intel_frontbuffer_flush().

Anyway this patch is:
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> This is completely untested! But maybe it should go to fixes/stable.

Yes. -fixes at least so we get it into 3.17. I'll spin it up on my bsw
and make sure it doesn't explode in some unforseen way.

> 
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c092ff4..e6cae59 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
>  		dev_priv->display.write_eld = ironlake_write_eld;
>  		dev_priv->display.modeset_global_resources =
>  			ivb_modeset_global_resources;
> -	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
> +	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
>  		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
>  		dev_priv->display.write_eld = haswell_write_eld;
>  		dev_priv->display.modeset_global_resources =
> -- 
> 2.1.0

-- 
Ville Syrjälä
Intel OTC

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: change CHV write_eld/global_resources function pointers
  2014-09-03  8:52 ` Ville Syrjälä
@ 2014-09-03  9:01   ` Daniel Vetter
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-09-03  9:01 UTC (permalink / raw)
  To: Ville Syrjälä; +Cc: intel-gfx, Paulo Zanoni

On Wed, Sep 03, 2014 at 11:52:43AM +0300, Ville Syrjälä wrote:
> On Tue, Sep 02, 2014 at 04:53:57PM -0300, Paulo Zanoni wrote:
> > From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > 
> > Currently, CHV is using the same functions as HSW/BDW instead of the
> > same functions as VLV. This looks wrong, especially since, for
> > example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW
> > check.
> > 
> > This patch has the potential to fix display audio and the CHV CDCLK.
> > 
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Whoops. These things seem to slip through a lot. I can imediately
> spot another IS_GEN8 fumble with intel_frontbuffer_flush().
> 
> Anyway this patch is:
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > 
> > This is completely untested! But maybe it should go to fixes/stable.
> 
> Yes. -fixes at least so we get it into 3.17. I'll spin it up on my bsw
> and make sure it doesn't explode in some unforseen way.

chv is still hidden behind the preliminary_hw flag, so no need for -fixes.
But we need the patch to remove this flag asap since the 3.18 merge window
will close roughly this week (if Dave really puts through his stance on
closing drm-next when -rc5 hits the streets).

Queued for -next, thanks for the patch.
-Daniel
> 
> > 
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index c092ff4..e6cae59 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
> >  		dev_priv->display.write_eld = ironlake_write_eld;
> >  		dev_priv->display.modeset_global_resources =
> >  			ivb_modeset_global_resources;
> > -	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
> > +	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
> >  		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
> >  		dev_priv->display.write_eld = haswell_write_eld;
> >  		dev_priv->display.modeset_global_resources =
> > -- 
> > 2.1.0
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-03  9:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-02 19:53 [PATCH] drm/i915: change CHV write_eld/global_resources function pointers Paulo Zanoni
2014-09-03  8:52 ` Ville Syrjälä
2014-09-03  9:01   ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox