Skip to contentSkip to conversation

drm/i915: remove intermediate link rate entries for CHV

PATCH In review Sivakumar Thulasimani 3 participants 5 messages Jul 30, 2015 – Jul 31, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: remove intermediate link rate entries for CHV

From: "Thulasimani,Sivakumar" <[email protected]>

CHV does not support intermediate link rates nor does it support HBR2. This patch removes those entries and returns HBR as the max link rate supported on CHV platform.

---
 drivers/gpu/drm/i915/intel_dp.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -8
index 898dc74..5c68b17 100644
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
 				  324000, 432000, 540000 };
 static const int skl_rates[] = { 162000, 216000, 270000,
 				  324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-				 243000, 270000, 324000, 405000,
-				 420000, 432000, 540000 };
 static const int default_rates[] = { 162000, 270000, 540000 };
 
 /**
@@ -1186,15 +1183,13 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 	} else if (IS_SKYLAKE(dev)) {
 		*source_rates = skl_rates;
 		return ARRAY_SIZE(skl_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
 	}
 
 	*source_rates = default_rates;
 
-	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-		/* WaDisableHBR2:skl */
+	/* WaDisableHBR2:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+		IS_CHERRYVIEW(dev))
 		return (DP_LINK_BW_2_7 >> 3) + 1;
 	else if (INTEL_INFO(dev)->gen >= 8 ||
 	    (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#1 lore raw
Quoted 5 lines · Sivakumar Thulasimani

From: "Thulasimani,Sivakumar" <[email protected]>

CHV does not support intermediate link rates nor does it support HBR2. This patch removes those entries and returns HBR as the max link rate supported on CHV platform.

These are two separate changes, and should be two separate patches. Moreover, the intermediate link rate change should be a revert of

commit fe51bfb95c996733150c44d21e1c9f4b6322a326

Author: Ville Syrjälä <[email protected]>
Date:   Thu Mar 12 17:10:38 2015 +0200

drm/i915: Add eDP intermediate frequencies for CHV

with Cc: Ville and Sonika to record this back and forth here.

BR,
Jani.

Quoted 46 lines
---
 drivers/gpu/drm/i915/intel_dp.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -8
index 898dc74..5c68b17 100644
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
 				  324000, 432000, 540000 };
 static const int skl_rates[] = { 162000, 216000, 270000,
 				  324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-				 243000, 270000, 324000, 405000,
-				 420000, 432000, 540000 };
 static const int default_rates[] = { 162000, 270000, 540000 };
 
 /**
@@ -1186,15 +1183,13 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 	} else if (IS_SKYLAKE(dev)) {
 		*source_rates = skl_rates;
 		return ARRAY_SIZE(skl_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
 	}
 
 	*source_rates = default_rates;
 
-	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-		/* WaDisableHBR2:skl */
+	/* WaDisableHBR2:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+		IS_CHERRYVIEW(dev))
 		return (DP_LINK_BW_2_7 >> 3) + 1;
 	else if (INTEL_INFO(dev)->gen >= 8 ||
 	    (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 14 lines · Jani Nikula
Quoted 5 lines · Sivakumar Thulasimani

From: "Thulasimani,Sivakumar" <[email protected]>

CHV does not support intermediate link rates nor does it support HBR2. This patch removes those entries and returns HBR as the max link rate supported on CHV platform.

These are two separate changes, and should be two separate patches. Moreover, the intermediate link rate change should be a revert of

commit fe51bfb95c996733150c44d21e1c9f4b6322a326

Author: Ville Syrjälä <[email protected]>
Date:   Thu Mar 12 17:10:38 2015 +0200
Quoted 6 lines

drm/i915: Add eDP intermediate frequencies for CHV

with Cc: Ville and Sonika to record this back and forth here.

BR,
Jani.

Sure, will share new patch that will revert the above one and create a new patch for restricting CHV to HBR.

Quoted 46 lines
Quoted 46 lines
---
  drivers/gpu/drm/i915/intel_dp.c |   11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -8
index 898dc74..5c68b17 100644
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
  				  324000, 432000, 540000 };
  static const int skl_rates[] = { 162000, 216000, 270000,
  				  324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-				 243000, 270000, 324000, 405000,
-				 420000, 432000, 540000 };
  static const int default_rates[] = { 162000, 270000, 540000 };
 
  /**
@@ -1186,15 +1183,13 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
  	} else if (IS_SKYLAKE(dev)) {
  		*source_rates = skl_rates;
  		return ARRAY_SIZE(skl_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
  	}
 
  	*source_rates = default_rates;
 
-	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-		/* WaDisableHBR2:skl */
+	/* WaDisableHBR2:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+		IS_CHERRYVIEW(dev))
  		return (DP_LINK_BW_2_7 >> 3) + 1;
  	else if (INTEL_INFO(dev)->gen >= 8 ||
  	    (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
regards,
Sivakumar

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
In reply to Sivakumar Thulasimani

This applies to all CHV derivatives, including BSW?

Gavin Hindman

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Sivakumar Thulasimani
Sent: Thursday, July 30, 2015 1:45 AM
To: [email protected]; [email protected]
Subject: [Intel-gfx] [PATCH] drm/i915: remove intermediate link rate entries for CHV

From: "Thulasimani,Sivakumar" <[email protected]>

CHV does not support intermediate link rates nor does it support HBR2. This patch removes those entries and returns HBR as the max link rate supported on CHV platform.

---
 drivers/gpu/drm/i915/intel_dp.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -8
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
 				  324000, 432000, 540000 };
 static const int skl_rates[] = { 162000, 216000, 270000,
 				  324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-				 243000, 270000, 324000, 405000,
-				 420000, 432000, 540000 };
 static const int default_rates[] = { 162000, 270000, 540000 };
 
 /**
@@ -1186,15 +1183,13 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 	} else if (IS_SKYLAKE(dev)) {
 		*source_rates = skl_rates;
 		return ARRAY_SIZE(skl_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
 	}
 
 	*source_rates = default_rates;
 
-	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-		/* WaDisableHBR2:skl */
+	/* WaDisableHBR2:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+		IS_CHERRYVIEW(dev))
 		return (DP_LINK_BW_2_7 >> 3) + 1;
 	else if (INTEL_INFO(dev)->gen >= 8 ||
 	    (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))

--
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 3 lines · Gavin

This applies to all CHV derivatives, including BSW?

Gavin Hindman

yes, this will apply to all CHV derivatives.

Quoted 54 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Sivakumar Thulasimani
Sent: Thursday, July 30, 2015 1:45 AM
To: [email protected]; [email protected]
Subject: [Intel-gfx] [PATCH] drm/i915: remove intermediate link rate entries for CHV

From: "Thulasimani,Sivakumar" <[email protected]>

CHV does not support intermediate link rates nor does it support HBR2. This patch removes those entries and returns HBR as the max link rate supported on CHV platform.

---
  drivers/gpu/drm/i915/intel_dp.c |   11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -9
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
  				  324000, 432000, 540000 };
  static const int skl_rates[] = { 162000, 216000, 270000,
  				  324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-				 243000, 270000, 324000, 405000,
-				 420000, 432000, 540000 };
  static const int default_rates[] = { 162000, 270000, 540000 };
 
  /**
@@ -1186,15 +1183,13 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
  	} else if (IS_SKYLAKE(dev)) {
  		*source_rates = skl_rates;
  		return ARRAY_SIZE(skl_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
  	}
 
  	*source_rates = default_rates;
 
-	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-		/* WaDisableHBR2:skl */
+	/* WaDisableHBR2:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+		IS_CHERRYVIEW(dev))
  		return (DP_LINK_BW_2_7 >> 3) + 1;
  	else if (INTEL_INFO(dev)->gen >= 8 ||
  	    (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
--

1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines
regards,
Sivakumar

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx