Re: [PATCH 35/49] drm/i915/bxt: fix panel fitter setup in crtc disable/enable

Daniel Vetter
2015-03-17T13:49:29Z

On Tue, Mar 17, 2015 at 11:40:01AM +0200, Imre Deak wrote:
> From: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> Broxton has the same panel fitter registers as Skylake.
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ba2d1ae..95ce0a8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4532,7 +4532,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
>
> intel_ddi_enable_pipe_clock(intel_crtc);
>
> - if (IS_SKYLAKE(dev))
> + if (INTEL_INFO(dev)->gen == 9)

Shouldn't we go with gen >= 9 here while at it?
-Daniel

> skylake_pfit_enable(intel_crtc);
> else
> ironlake_pfit_enable(intel_crtc);
> @@ -4695,7 +4695,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
>
> intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
>
> - if (IS_SKYLAKE(dev))
> + if (INTEL_INFO(dev)->gen == 9)
> skylake_pfit_disable(intel_crtc);
> else
> ironlake_pfit_disable(intel_crtc);
> @@ -8504,7 +8504,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
>
> pfit_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
> if (intel_display_power_is_enabled(dev_priv, pfit_domain)) {
> - if (IS_SKYLAKE(dev))
> + if (INTEL_INFO(dev)->gen == 9)
> skylake_get_pfit_config(crtc, pipe_config);
> else
> ironlake_get_pfit_config(crtc, pipe_config);
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation