FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree

PATCH In review [email protected] 2 participants 6 messages Sep 11, 2015 – Sep 14, 2015

Subsystems (3)

Stable branch DRM drivers Intel i915

lore

Share & tools

lore

[email protected]

author maintainer

2015-09-11 22:25 UTC #0 lore raw

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 33747cc5ec036036ae3088d02982d3571c7d8500 Mon Sep 17 00:00:00 2001

From: "Thulasimani,Sivakumar" <[email protected]>
Date: Tue, 18 Aug 2015 11:07:56 +0530
Subject: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts
commit fe51bfb95c996733150c44d21e1c9f4b6322a326.

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

CHV does not support intermediate frequencies so reverting the patch that added it in the first place

Cc [email protected] # v4.1+

Reviewed-by Ville Syrjälä <[email protected]>

Signed-off-by Sivakumar Thulasimani <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

drivers/gpu/drm/i915/intel_dp.c +0 -6

index 6e8faa253792..6c8bf34ab16a 100644
@@ -93,9 +93,6 @@ static const struct dp_link_dpll chv_dpll[] = {
 
 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 };
 
 /**

@@ -1175,9 +1172,6 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 	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;

Sivakumar Thulasimani

2015-09-14 04:55 UTC #1 lore raw

PATCH 1/1 Revert "drm/i915: Add eDP intermediate frequencies for CHV"

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

This reverts

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

CHV does not support intermediate frequencies so reverting the patch that added it in the first place

Cc [email protected]

Reviewed-by Ville Syrjälä <[email protected]>

Signed-off-by Sivakumar Thulasimani <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 drivers/gpu/drm/i915/intel_dp.c |    6 ------
 1 file changed, 6 deletions(-)

drivers/gpu/drm/i915/intel_dp.c +0 -6

index b1fe32b..3e277c4 100644
@@ -87,9 +87,6 @@ static const struct dp_link_dpll chv_dpll[] = {
 /* Skylake supports following rates */
 static const int gen9_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 };
 
 /**

@@ -1169,9 +1166,6 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 	if (INTEL_INFO(dev)->gen >= 9) {
 		*source_rates = gen9_rates;
 		return ARRAY_SIZE(gen9_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
 	}
 
 	*source_rates = default_rates;

Signature · 6 lines

1.7.9.5

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

Sivakumar Thulasimani

2015-09-14 04:59 UTC #2 lore raw

Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"

+adding Greg who was missed in reply-to mail

Quoted 42 lines · Sivakumar Thulasimani

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

This reverts

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

CHV does not support intermediate frequencies so reverting the patch that added it in the first place

Cc [email protected]

Reviewed-by Ville Syrjälä <[email protected]>

Signed-off-by Sivakumar Thulasimani <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dp.c |    6 ------
  1 file changed, 6 deletions(-)

drivers/gpu/drm/i915/intel_dp.c +0 -6

index b1fe32b..3e277c4 100644
@@ -87,9 +87,6 @@ static const struct dp_link_dpll chv_dpll[] = {
  /* Skylake supports following rates */
  static const int gen9_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 };
 
  /**

@@ -1169,9 +1166,6 @@ intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
  	if (INTEL_INFO(dev)->gen >= 9) {
  		*source_rates = gen9_rates;
  		return ARRAY_SIZE(gen9_rates);
-	} else if (IS_CHERRYVIEW(dev)) {
-		*source_rates = chv_rates;
-		return ARRAY_SIZE(chv_rates);
  	}
 
  	*source_rates = default_rates;

Signature · 2 lines

regards,
Sivakumar

Greg KH

author maintainer

2015-09-14 05:17 UTC #3 lore raw

Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"

Quoted 20 lines · Sivakumar Thulasimani

+adding Greg who was missed in reply-to mail
Quoted 17 lines · Sivakumar Thulasimani
From: "Thulasimani,Sivakumar" <[email protected]>
This reverts
commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
Author: Ville Syrjï¿½lï¿½ <[email protected]>
Date:   Thu Mar 12 17:10:38 2015 +0200
CHV does not support intermediate frequencies so reverting the patch that added it in the first place
Cc [email protected]
Reviewed-by Ville Syrjï¿½lï¿½ <[email protected]>
Signed-off-by Sivakumar Thulasimani <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c |    6 ------
 1 file changed, 6 deletions(-)

Why do I care about this?

If this is a backport, someone better be much more specific as to what is going on here, as I have no idea...

greg k-h

Sivakumar Thulasimani

2015-09-14 05:22 UTC #4 lore raw

Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"

Quoted 21 lines · Greg KH

Quoted 20 lines · Sivakumar Thulasimani
+adding Greg who was missed in reply-to mail
Quoted 17 lines · Sivakumar Thulasimani
From: "Thulasimani,Sivakumar" <[email protected]>
This reverts
commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
Author: Ville Syrjï¿½lï¿½ <[email protected]>
Date:   Thu Mar 12 17:10:38 2015 +0200
CHV does not support intermediate frequencies so reverting the patch that added it in the first place
Cc [email protected]
Reviewed-by Ville Syrjï¿½lï¿½ <[email protected]>
Signed-off-by Sivakumar Thulasimani <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
  drivers/gpu/drm/i915/intel_dp.c |    6 ------
  1 file changed, 6 deletions(-)

Quoted 6 lines

Why do I care about this?
If this is a backport, someone better be much more specific as to what is going on here, as I have no idea...
greg k-h

this was in reply to your earlier email
"FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree" , probably broke the thread due to not adding you in the original reply. added as an FYI.

Signature · 2 lines

regards,
Sivakumar

Greg KH

author maintainer

2015-09-14 14:17 UTC #5 lore raw

Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"

Quoted 29 lines · Sivakumar Thulasimani

Quoted 26 lines · Greg KH
Quoted 20 lines · Sivakumar Thulasimani
+adding Greg who was missed in reply-to mail
Quoted 17 lines · Sivakumar Thulasimani
From: "Thulasimani,Sivakumar" <[email protected]>
This reverts
commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
Author: Ville Syrjï¿½lï¿½ <[email protected]>
Date:   Thu Mar 12 17:10:38 2015 +0200
CHV does not support intermediate frequencies so reverting the patch that added it in the first place
Cc [email protected]
Reviewed-by Ville Syrjï¿½lï¿½ <[email protected]>
Signed-off-by Sivakumar Thulasimani <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c |    6 ------
 1 file changed, 6 deletions(-)
Why do I care about this?
If this is a backport, someone better be much more specific as to what is going on here, as I have no idea...

Quoted 6 lines

Quoted 1 line
greg k-h
this was in reply to your earlier email
"FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree"
, probably broke the thread due to not adding you in the original reply. added as an FYI.

Please read Documentation/stable_kernel_rules.txt for how to properly send patches in for stable kernels (hint, I need a git commit id, and other stuff...)

thanks,

greg k-h