* FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree
@ 2015-09-11 22:24 gregkh
2015-09-14 4:55 ` [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV" Sivakumar Thulasimani
0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2015-09-11 22:24 UTC (permalink / raw)
To: sivakumar.thulasimani, jani.nikula, ville.syrjala; +Cc: stable
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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 33747cc5ec036036ae3088d02982d3571c7d8500 Mon Sep 17 00:00:00 2001
From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
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ä <ville.syrjala@linux.intel.com>
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: stable@vger.kernel.org # v4.1+
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 6e8faa253792..6c8bf34ab16a 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -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;
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
2015-09-11 22:24 FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree gregkh
@ 2015-09-14 4:55 ` Sivakumar Thulasimani
2015-09-14 4:59 ` Sivakumar Thulasimani
0 siblings, 1 reply; 6+ messages in thread
From: Sivakumar Thulasimani @ 2015-09-14 4:55 UTC (permalink / raw)
To: intel-gfx; +Cc: Thulasimani,Sivakumar, stable, Jani Nikula
From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
This reverts
commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
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: stable@vger.kernel.org
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b1fe32b..3e277c4 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
2015-09-14 4:55 ` [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV" Sivakumar Thulasimani
@ 2015-09-14 4:59 ` Sivakumar Thulasimani
2015-09-14 5:17 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Sivakumar Thulasimani @ 2015-09-14 4:59 UTC (permalink / raw)
Cc: stable, Jani Nikula, gregkh
+adding Greg who was missed in reply-to mail
On 9/14/2015 10:25 AM, Sivakumar Thulasimani wrote:
> From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
>
> This reverts
> commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 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: stable@vger.kernel.org
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b1fe32b..3e277c4 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -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;
--
regards,
Sivakumar
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
2015-09-14 4:59 ` Sivakumar Thulasimani
@ 2015-09-14 5:17 ` Greg KH
2015-09-14 5:22 ` Sivakumar Thulasimani
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2015-09-14 5:17 UTC (permalink / raw)
To: Sivakumar Thulasimani; +Cc: stable, Jani Nikula
On Mon, Sep 14, 2015 at 10:29:49AM +0530, Sivakumar Thulasimani wrote:
> +adding Greg who was missed in reply-to mail
>
> On 9/14/2015 10:25 AM, Sivakumar Thulasimani wrote:
> >From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
> >
> >This reverts
> >commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
> >Author: Ville Syrj�l� <ville.syrjala@linux.intel.com>
> >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: stable@vger.kernel.org
> >Reviewed-by: Ville Syrj�l� <ville.syrjala@linux.intel.com>
> >Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> >Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >---
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
2015-09-14 5:17 ` Greg KH
@ 2015-09-14 5:22 ` Sivakumar Thulasimani
2015-09-14 14:17 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Sivakumar Thulasimani @ 2015-09-14 5:22 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Jani Nikula
On 9/14/2015 10:47 AM, Greg KH wrote:
> On Mon, Sep 14, 2015 at 10:29:49AM +0530, Sivakumar Thulasimani wrote:
>> +adding Greg who was missed in reply-to mail
>>
>> On 9/14/2015 10:25 AM, Sivakumar Thulasimani wrote:
>>> From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
>>>
>>> This reverts
>>> commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
>>> Author: Ville Syrj�l� <ville.syrjala@linux.intel.com>
>>> 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: stable@vger.kernel.org
>>> Reviewed-by: Ville Syrj�l� <ville.syrjala@linux.intel.com>
>>> Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>> ---
>>> 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
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.
--
regards,
Sivakumar
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"
2015-09-14 5:22 ` Sivakumar Thulasimani
@ 2015-09-14 14:17 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2015-09-14 14:17 UTC (permalink / raw)
To: Sivakumar Thulasimani; +Cc: stable, Jani Nikula
On Mon, Sep 14, 2015 at 10:52:52AM +0530, Sivakumar Thulasimani wrote:
>
>
> On 9/14/2015 10:47 AM, Greg KH wrote:
> >On Mon, Sep 14, 2015 at 10:29:49AM +0530, Sivakumar Thulasimani wrote:
> >>+adding Greg who was missed in reply-to mail
> >>
> >>On 9/14/2015 10:25 AM, Sivakumar Thulasimani wrote:
> >>>From: "Thulasimani,Sivakumar" <sivakumar.thulasimani@intel.com>
> >>>
> >>>This reverts
> >>>commit: fe51bfb95c996733150c44d21e1c9f4b6322a326.
> >>>Author: Ville Syrj�l� <ville.syrjala@linux.intel.com>
> >>>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: stable@vger.kernel.org
> >>>Reviewed-by: Ville Syrj�l� <ville.syrjala@linux.intel.com>
> >>>Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> >>>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >>>---
> >>> 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
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-14 14:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-11 22:24 FAILED: patch "[PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV"" failed to apply to 4.1-stable tree gregkh
2015-09-14 4:55 ` [PATCH] Revert "drm/i915: Add eDP intermediate frequencies for CHV" Sivakumar Thulasimani
2015-09-14 4:59 ` Sivakumar Thulasimani
2015-09-14 5:17 ` Greg KH
2015-09-14 5:22 ` Sivakumar Thulasimani
2015-09-14 14:17 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).