* [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable
2018-07-19 21:48 [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Nathan Ciobanu
@ 2018-07-20 0:07 ` Nathan Ciobanu
2018-07-20 0:29 ` ✗ Fi.CI.BAT: failure for series starting with [v5,2/2] drm/i915/dp: Refactor mav_vswing_tries variable (rev2) Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Nathan Ciobanu @ 2018-07-20 0:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Marc Herbert, Dhinakaran Pandiyan, Rodrigo Vivi
Changes the type and renames the max_vswing_tries variable
which was declared as an integer but used as a boolean
making it easy to be confused with a counter.
Changes in v2:
- updated the title and commit message
- left the loop exit point in place
v3: fix typo in title
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Marc Herbert <marc.herbert@intel.com>
Signed-off-by: Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
index 7903de7a54c9..ec5f2bb55c9a 100644
--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
@@ -129,7 +129,8 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
{
uint8_t voltage;
- int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;
+ int voltage_tries, cr_tries, max_cr_tries;
+ bool max_vswing = false;
uint8_t link_config[2];
uint8_t link_bw, rate_select;
@@ -181,7 +182,6 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
max_cr_tries = 80;
voltage_tries = 1;
- max_vswing_tries = 0;
for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
uint8_t link_status[DP_LINK_STATUS_SIZE];
@@ -202,7 +202,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
return false;
}
- if (max_vswing_tries == 1) {
+ if (max_vswing) {
DRM_DEBUG_KMS("Max Voltage Swing reached\n");
return false;
}
@@ -223,7 +223,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
voltage_tries = 1;
if (intel_dp_link_max_vswing_reached(intel_dp))
- ++max_vswing_tries;
+ max_vswing = true;
}
DRM_ERROR("Failed clock recovery %d times, giving up!\n", max_cr_tries);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* ✗ Fi.CI.BAT: failure for series starting with [v5,2/2] drm/i915/dp: Refactor mav_vswing_tries variable (rev2)
2018-07-19 21:48 [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Nathan Ciobanu
2018-07-20 0:07 ` [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable Nathan Ciobanu
@ 2018-07-20 0:29 ` Patchwork
2018-07-20 10:19 ` [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Ville Syrjälä
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-20 0:29 UTC (permalink / raw)
To: Nathan Ciobanu; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v5,2/2] drm/i915/dp: Refactor mav_vswing_tries variable (rev2)
URL : https://patchwork.freedesktop.org/series/46897/
State : failure
== Summary ==
Applying: drm/i915/dp: Refactor mav_vswing_tries variable
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_dp_link_training.c).
error: could not build fake ancestor
Patch failed at 0001 drm/i915/dp: Refactor mav_vswing_tries variable
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable
2018-07-19 21:48 [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Nathan Ciobanu
2018-07-20 0:07 ` [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable Nathan Ciobanu
2018-07-20 0:29 ` ✗ Fi.CI.BAT: failure for series starting with [v5,2/2] drm/i915/dp: Refactor mav_vswing_tries variable (rev2) Patchwork
@ 2018-07-20 10:19 ` Ville Syrjälä
2018-07-20 18:27 ` Nathan Ciobanu
2018-07-20 18:23 ` [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable Nathan Ciobanu
2018-07-20 19:16 ` ✗ Fi.CI.BAT: failure for series starting with [v5] drm/i915/dp: Refactor max_vswing_tries variable (rev3) Patchwork
4 siblings, 1 reply; 8+ messages in thread
From: Ville Syrjälä @ 2018-07-20 10:19 UTC (permalink / raw)
To: Nathan Ciobanu; +Cc: intel-gfx, Rodrigo Vivi, Marc Herbert, Dhinakaran Pandiyan
On Thu, Jul 19, 2018 at 02:48:07PM -0700, Nathan Ciobanu wrote:
> Changes the type and renames the max_vswing_tries variable
> which was declared as an integer but used as a boolean
> making it easy to be confused with a counter.
>
> Changes in v2:
> - updated the title and commit message
> - left the loop exit point in place
>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Marc Herbert <marc.herbert@intel.com>
> Signed-off-by: Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
> index 7903de7a54c9..ec5f2bb55c9a 100644
> --- a/drivers/gpu/drm/i915/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
> @@ -129,7 +129,8 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
> {
> uint8_t voltage;
> - int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;
> + int voltage_tries, cr_tries, max_cr_tries;
> + bool max_vswing = false;
max_vswing_reached?
> uint8_t link_config[2];
> uint8_t link_bw, rate_select;
>
> @@ -181,7 +182,6 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> max_cr_tries = 80;
>
> voltage_tries = 1;
> - max_vswing_tries = 0;
> for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
> uint8_t link_status[DP_LINK_STATUS_SIZE];
>
> @@ -202,7 +202,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> return false;
> }
>
> - if (max_vswing_tries == 1) {
> + if (max_vswing) {
> DRM_DEBUG_KMS("Max Voltage Swing reached\n");
> return false;
> }
> @@ -223,7 +223,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> voltage_tries = 1;
>
> if (intel_dp_link_max_vswing_reached(intel_dp))
> - ++max_vswing_tries;
> + max_vswing = true;
>
> }
> DRM_ERROR("Failed clock recovery %d times, giving up!\n", max_cr_tries);
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable
2018-07-20 10:19 ` [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Ville Syrjälä
@ 2018-07-20 18:27 ` Nathan Ciobanu
0 siblings, 0 replies; 8+ messages in thread
From: Nathan Ciobanu @ 2018-07-20 18:27 UTC (permalink / raw)
To: Ville Syrjälä
Cc: intel-gfx, Rodrigo Vivi, Marc Herbert, Dhinakaran Pandiyan
On Fri, Jul 20, 2018 at 01:19:02PM +0300, Ville Syrjälä wrote:
> On Thu, Jul 19, 2018 at 02:48:07PM -0700, Nathan Ciobanu wrote:
> > Changes the type and renames the max_vswing_tries variable
> > which was declared as an integer but used as a boolean
> > making it easy to be confused with a counter.
> >
> > Changes in v2:
> > - updated the title and commit message
> > - left the loop exit point in place
> >
> > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Marc Herbert <marc.herbert@intel.com>
> > Signed-off-by: Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
> > index 7903de7a54c9..ec5f2bb55c9a 100644
> > --- a/drivers/gpu/drm/i915/intel_dp_link_training.c
> > +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
> > @@ -129,7 +129,8 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> > intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
> > {
> > uint8_t voltage;
> > - int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;
> > + int voltage_tries, cr_tries, max_cr_tries;
> > + bool max_vswing = false;
>
> max_vswing_reached?
Ok, I renamed it and resent the patch. Thanks,
Nathan
>
> > uint8_t link_config[2];
> > uint8_t link_bw, rate_select;
> >
> > @@ -181,7 +182,6 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> > max_cr_tries = 80;
> >
> > voltage_tries = 1;
> > - max_vswing_tries = 0;
> > for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
> > uint8_t link_status[DP_LINK_STATUS_SIZE];
> >
> > @@ -202,7 +202,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> > return false;
> > }
> >
> > - if (max_vswing_tries == 1) {
> > + if (max_vswing) {
> > DRM_DEBUG_KMS("Max Voltage Swing reached\n");
> > return false;
> > }
> > @@ -223,7 +223,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> > voltage_tries = 1;
> >
> > if (intel_dp_link_max_vswing_reached(intel_dp))
> > - ++max_vswing_tries;
> > + max_vswing = true;
> >
> > }
> > DRM_ERROR("Failed clock recovery %d times, giving up!\n", max_cr_tries);
> > --
> > 1.9.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable
2018-07-19 21:48 [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Nathan Ciobanu
` (2 preceding siblings ...)
2018-07-20 10:19 ` [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Ville Syrjälä
@ 2018-07-20 18:23 ` Nathan Ciobanu
2018-07-20 19:12 ` Rodrigo Vivi
2018-07-20 19:16 ` ✗ Fi.CI.BAT: failure for series starting with [v5] drm/i915/dp: Refactor max_vswing_tries variable (rev3) Patchwork
4 siblings, 1 reply; 8+ messages in thread
From: Nathan Ciobanu @ 2018-07-20 18:23 UTC (permalink / raw)
To: intel-gfx; +Cc: Marc Herbert, Dhinakaran Pandiyan, Rodrigo Vivi
Changes the type and renames the max_vswing_tries variable
which was declared as an integer but used as a boolean
making it easy to be confused with a counter.
Changes in v2:
- updated the title and commit message
- left the loop exit point in place
v3: fix typo in title
v4: renamed max_vswing to max_vswing_reached (Ville)
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Marc Herbert <marc.herbert@intel.com>
Signed-off-by: Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
index 7903de7a54c9..0d418f5a59b0 100644
--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
@@ -129,7 +129,8 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
{
uint8_t voltage;
- int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;
+ int voltage_tries, cr_tries, max_cr_tries;
+ bool max_vswing_reached = false;
uint8_t link_config[2];
uint8_t link_bw, rate_select;
@@ -181,7 +182,6 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
max_cr_tries = 80;
voltage_tries = 1;
- max_vswing_tries = 0;
for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
uint8_t link_status[DP_LINK_STATUS_SIZE];
@@ -202,7 +202,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
return false;
}
- if (max_vswing_tries == 1) {
+ if (max_vswing_reached) {
DRM_DEBUG_KMS("Max Voltage Swing reached\n");
return false;
}
@@ -223,7 +223,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
voltage_tries = 1;
if (intel_dp_link_max_vswing_reached(intel_dp))
- ++max_vswing_tries;
+ max_vswing_reached = true;
}
DRM_ERROR("Failed clock recovery %d times, giving up!\n", max_cr_tries);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable
2018-07-20 18:23 ` [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable Nathan Ciobanu
@ 2018-07-20 19:12 ` Rodrigo Vivi
0 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-07-20 19:12 UTC (permalink / raw)
To: Nathan Ciobanu; +Cc: Marc Herbert, intel-gfx, Dhinakaran Pandiyan
On Fri, Jul 20, 2018 at 11:23:43AM -0700, Nathan Ciobanu wrote:
> Changes the type and renames the max_vswing_tries variable
> which was declared as an integer but used as a boolean
> making it easy to be confused with a counter.
>
> Changes in v2:
> - updated the title and commit message
> - left the loop exit point in place
>
> v3: fix typo in title
> v4: renamed max_vswing to max_vswing_reached (Ville)
>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Marc Herbert <marc.herbert@intel.com>
> Signed-off-by: Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
> index 7903de7a54c9..0d418f5a59b0 100644
> --- a/drivers/gpu/drm/i915/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
> @@ -129,7 +129,8 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
> {
> uint8_t voltage;
> - int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;
> + int voltage_tries, cr_tries, max_cr_tries;
> + bool max_vswing_reached = false;
> uint8_t link_config[2];
> uint8_t link_bw, rate_select;
>
> @@ -181,7 +182,6 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> max_cr_tries = 80;
>
> voltage_tries = 1;
> - max_vswing_tries = 0;
> for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
> uint8_t link_status[DP_LINK_STATUS_SIZE];
>
> @@ -202,7 +202,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> return false;
> }
>
> - if (max_vswing_tries == 1) {
> + if (max_vswing_reached) {
> DRM_DEBUG_KMS("Max Voltage Swing reached\n");
> return false;
> }
> @@ -223,7 +223,7 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
> voltage_tries = 1;
>
> if (intel_dp_link_max_vswing_reached(intel_dp))
> - ++max_vswing_tries;
> + max_vswing_reached = true;
>
> }
> DRM_ERROR("Failed clock recovery %d times, giving up!\n", max_cr_tries);
> --
> 1.9.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [v5] drm/i915/dp: Refactor max_vswing_tries variable (rev3)
2018-07-19 21:48 [PATCH v5 2/2] drm/i915/dp: Refactor mav_vswing_tries variable Nathan Ciobanu
` (3 preceding siblings ...)
2018-07-20 18:23 ` [PATCH v5] drm/i915/dp: Refactor max_vswing_tries variable Nathan Ciobanu
@ 2018-07-20 19:16 ` Patchwork
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-20 19:16 UTC (permalink / raw)
To: Nathan Ciobanu; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v5] drm/i915/dp: Refactor max_vswing_tries variable (rev3)
URL : https://patchwork.freedesktop.org/series/46897/
State : failure
== Summary ==
Applying: drm/i915/dp: Refactor max_vswing_tries variable
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_dp_link_training.c).
error: could not build fake ancestor
Patch failed at 0001 drm/i915/dp: Refactor max_vswing_tries variable
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread