[PATCH] drm/i915/bxt: Fix eDP panel fitting

[PATCH] drm/i915/bxt: Fix eDP panel fitting

[Matt Roper]

BXT CRTC scaling uses the same gen9 codepaths as SKL; these codepaths
store panel fitter information in pipe_config->pch_pfit.  However since
HAS_PCH_SPLIT() is false for BXT we never actually wind up filling in
this structure (we wind up filling in pipe_config->gmch_pfit instead,
which is ignored when we go to program the hardware).  Make sure we
always take the PCH code path on gen9+ platforms.

Cc: Imre Deak <imre.deak@intel.com>
Cc: Chandra Konduru <chandra.konduru@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
Not a regression as far as I know; I believe this has been broken since BXT
support was added to the driver.

 drivers/gpu/drm/i915/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 1cb1f3f..a8bbc2d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1426,7 +1426,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 				return ret;
 		}
 
-		if (!HAS_PCH_SPLIT(dev))
+		if (!HAS_PCH_SPLIT(dev) && INTEL_INFO(dev)->gen < 9)
 			intel_gmch_panel_fitting(intel_crtc, pipe_config,
 						 intel_connector->panel.fitting_mode);
 		else
-- 
2.1.4

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

Re: [PATCH] drm/i915/bxt: Fix eDP panel fitting

[Ville Syrjälä]

On Tue, Nov 03, 2015 at 06:29:41PM -0800, Matt Roper wrote:
> BXT CRTC scaling uses the same gen9 codepaths as SKL; these codepaths
> store panel fitter information in pipe_config->pch_pfit.  However since
> HAS_PCH_SPLIT() is false for BXT we never actually wind up filling in
> this structure (we wind up filling in pipe_config->gmch_pfit instead,
> which is ignored when we go to program the hardware).  Make sure we
> always take the PCH code path on gen9+ platforms.
> 
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Chandra Konduru <chandra.konduru@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> Not a regression as far as I know; I believe this has been broken since BXT
> support was added to the driver.
> 
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1cb1f3f..a8bbc2d 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1426,7 +1426,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  				return ret;
>  		}
>  
> -		if (!HAS_PCH_SPLIT(dev))
> +		if (!HAS_PCH_SPLIT(dev) && INTEL_INFO(dev)->gen < 9)

HAS_GMCH_DISPLAY() would be neater.

with that
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  			intel_gmch_panel_fitting(intel_crtc, pipe_config,
>  						 intel_connector->panel.fitting_mode);
>  		else
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/bxt: Fix eDP panel fitting (v2)

[Matt Roper]

BXT CRTC scaling uses the same gen9 codepaths as SKL; these codepaths
store panel fitter information in pipe_config->pch_pfit.  However since
HAS_PCH_SPLIT() is false for BXT we never actually wind up filling in
this structure (we wind up filling in pipe_config->gmch_pfit instead,
which is ignored when we go to program the hardware).  Make sure we
always take the PCH code path on gen9+ platforms.

v2: Use HAS_GMCH_DISPLAY() to more cleanly describe the platforms that
    actually want to use GMCH-style panel fitting.  (Ville)

Cc: Imre Deak <imre.deak@intel.com>
Cc: Chandra Konduru <chandra.konduru@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 1cb1f3f..4655af0 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1426,7 +1426,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 				return ret;
 		}
 
-		if (!HAS_PCH_SPLIT(dev))
+		if (HAS_GMCH_DISPLAY(dev))
 			intel_gmch_panel_fitting(intel_crtc, pipe_config,
 						 intel_connector->panel.fitting_mode);
 		else
-- 
2.1.4

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

Re: [PATCH] drm/i915/bxt: Fix eDP panel fitting (v2)

[Bob Paauwe]

On Wed, 4 Nov 2015 09:05:27 -0800
Matt Roper <matthew.d.roper@intel.com> wrote:

> BXT CRTC scaling uses the same gen9 codepaths as SKL; these codepaths
> store panel fitter information in pipe_config->pch_pfit.  However since
> HAS_PCH_SPLIT() is false for BXT we never actually wind up filling in
> this structure (we wind up filling in pipe_config->gmch_pfit instead,
> which is ignored when we go to program the hardware).  Make sure we
> always take the PCH code path on gen9+ platforms.
> 
> v2: Use HAS_GMCH_DISPLAY() to more cleanly describe the platforms that
>     actually want to use GMCH-style panel fitting.  (Ville)
> 
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Chandra Konduru <chandra.konduru@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1cb1f3f..4655af0 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1426,7 +1426,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  				return ret;
>  		}
>  
> -		if (!HAS_PCH_SPLIT(dev))
> +		if (HAS_GMCH_DISPLAY(dev))
>  			intel_gmch_panel_fitting(intel_crtc, pipe_config,
>  						 intel_connector->panel.fitting_mode);
>  		else

Reviewed-by: Bob Paauwe <bob.j.paauwe@intel.com>
Tested-by: Bob Paauwe <bob.j.paauwe@intel.com>

-- 
--
Bob Paauwe                  
Bob.J.Paauwe@intel.com
IOTG / PED Software Organization
Intel Corp.  Folsom, CA
(916) 356-6193    

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