[Intel-gfx] [PATCH] drm/i915: change CHV write_eld/global_resources function pointers

[Ville Syrjälä]

On Tue, Sep 02, 2014 at 04:53:57PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni at 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 at linux.intel.com>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at 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 at 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