* [patch] drm/i915: precedence bug in hsw_compute_wm_results()
@ 2013-08-09 9:43 Dan Carpenter
2013-08-09 9:58 ` Chris Wilson
2013-08-09 10:04 ` [patch] drm/i915: precedence bug " Ville Syrjälä
0 siblings, 2 replies; 6+ messages in thread
From: Dan Carpenter @ 2013-08-09 9:43 UTC (permalink / raw)
To: Daniel Vetter; +Cc: David Airlie, intel-gfx, dri-devel, kernel-janitors
The '!' operation has higher precedence than the compare so probably
this test is never true.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a5a9959..0b9d9a7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2562,7 +2562,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
* a WM level. */
results->enable_fbc_wm = true;
for (level = 1; level <= max_level; level++) {
- if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
+ if (lp_results[level - 1].fbc_val <= lp_maximums->fbc) {
results->enable_fbc_wm = false;
lp_results[level - 1].fbc_val = 0;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch] drm/i915: precedence bug in hsw_compute_wm_results()
2013-08-09 9:43 [patch] drm/i915: precedence bug in hsw_compute_wm_results() Dan Carpenter
@ 2013-08-09 9:58 ` Chris Wilson
2013-08-09 10:07 ` [patch v2] drm/i915: fix a limit check " Dan Carpenter
2013-08-09 10:04 ` [patch] drm/i915: precedence bug " Ville Syrjälä
1 sibling, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2013-08-09 9:58 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Daniel Vetter, intel-gfx, kernel-janitors, dri-devel
On Fri, Aug 09, 2013 at 12:43:02PM +0300, Dan Carpenter wrote:
> The '!' operation has higher precedence than the compare so probably
> this test is never true.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a5a9959..0b9d9a7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2562,7 +2562,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
> * a WM level. */
> results->enable_fbc_wm = true;
> for (level = 1; level <= max_level; level++) {
> - if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> + if (lp_results[level - 1].fbc_val <= lp_maximums->fbc) {
I didn't spot that '!' at all. It's a stray and should be just removed.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch v2] drm/i915: fix a limit check in hsw_compute_wm_results()
2013-08-09 9:58 ` Chris Wilson
@ 2013-08-09 10:07 ` Dan Carpenter
2013-08-09 10:29 ` [Intel-gfx] " Ville Syrjälä
0 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2013-08-09 10:07 UTC (permalink / raw)
To: Daniel Vetter, Chris Wilson
Cc: David Airlie, intel-gfx, dri-devel, kernel-janitors
The '!' here was not intended. Since '!' has higher precedence than
compare, it means the check is never true.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: My first patch was wrong.
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 96234c6..0f5eb21 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2685,7 +2685,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
* a WM level. */
results->enable_fbc_wm = true;
for (level = 1; level <= max_level; level++) {
- if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
+ if (lp_results[level - 1].fbc_val > lp_maximums->fbc) {
results->enable_fbc_wm = false;
lp_results[level - 1].fbc_val = 0;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Intel-gfx] [patch v2] drm/i915: fix a limit check in hsw_compute_wm_results()
2013-08-09 10:07 ` [patch v2] drm/i915: fix a limit check " Dan Carpenter
@ 2013-08-09 10:29 ` Ville Syrjälä
2013-08-09 16:27 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Ville Syrjälä @ 2013-08-09 10:29 UTC (permalink / raw)
To: Dan Carpenter
Cc: Daniel Vetter, Chris Wilson, David Airlie, intel-gfx,
kernel-janitors, dri-devel
On Fri, Aug 09, 2013 at 01:07:31PM +0300, Dan Carpenter wrote:
> The '!' here was not intended. Since '!' has higher precedence than
> compare, it means the check is never true.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
The culprit for Daniel:
commit 71fff20ff1bb790f4defe0c880e028581ffab420
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Tue Aug 6 22:24:03 2013 +0300
drm/i915: Kill fbc_enable from hsw_lp_wm_results
> ---
> v2: My first patch was wrong.
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 96234c6..0f5eb21 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2685,7 +2685,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
> * a WM level. */
> results->enable_fbc_wm = true;
> for (level = 1; level <= max_level; level++) {
> - if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> + if (lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> results->enable_fbc_wm = false;
> lp_results[level - 1].fbc_val = 0;
> }
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Intel-gfx] [patch v2] drm/i915: fix a limit check in hsw_compute_wm_results()
2013-08-09 10:29 ` [Intel-gfx] " Ville Syrjälä
@ 2013-08-09 16:27 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2013-08-09 16:27 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Dan Carpenter, Daniel Vetter, Chris Wilson, David Airlie,
intel-gfx, kernel-janitors, dri-devel
On Fri, Aug 09, 2013 at 01:29:33PM +0300, Ville Syrjälä wrote:
> On Fri, Aug 09, 2013 at 01:07:31PM +0300, Dan Carpenter wrote:
> > The '!' here was not intended. Since '!' has higher precedence than
> > compare, it means the check is never true.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> The culprit for Daniel:
>
> commit 71fff20ff1bb790f4defe0c880e028581ffab420
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date: Tue Aug 6 22:24:03 2013 +0300
>
> drm/i915: Kill fbc_enable from hsw_lp_wm_results
Queued for -next, thanks for the patch.
-Daniel
>
> > ---
> > v2: My first patch was wrong.
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 96234c6..0f5eb21 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -2685,7 +2685,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
> > * a WM level. */
> > results->enable_fbc_wm = true;
> > for (level = 1; level <= max_level; level++) {
> > - if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> > + if (lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> > results->enable_fbc_wm = false;
> > lp_results[level - 1].fbc_val = 0;
> > }
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] drm/i915: precedence bug in hsw_compute_wm_results()
2013-08-09 9:43 [patch] drm/i915: precedence bug in hsw_compute_wm_results() Dan Carpenter
2013-08-09 9:58 ` Chris Wilson
@ 2013-08-09 10:04 ` Ville Syrjälä
1 sibling, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2013-08-09 10:04 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Daniel Vetter, intel-gfx, kernel-janitors, dri-devel
On Fri, Aug 09, 2013 at 12:43:02PM +0300, Dan Carpenter wrote:
> The '!' operation has higher precedence than the compare so probably
> this test is never true.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a5a9959..0b9d9a7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2562,7 +2562,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
> * a WM level. */
> results->enable_fbc_wm = true;
> for (level = 1; level <= max_level; level++) {
> - if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
> + if (lp_results[level - 1].fbc_val <= lp_maximums->fbc) {
Whoops. My bad.
It should still be > but ! should just be dropped.
> results->enable_fbc_wm = false;
> lp_results[level - 1].fbc_val = 0;
> }
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel OTC
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-09 16:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-09 9:43 [patch] drm/i915: precedence bug in hsw_compute_wm_results() Dan Carpenter
2013-08-09 9:58 ` Chris Wilson
2013-08-09 10:07 ` [patch v2] drm/i915: fix a limit check " Dan Carpenter
2013-08-09 10:29 ` [Intel-gfx] " Ville Syrjälä
2013-08-09 16:27 ` Daniel Vetter
2013-08-09 10:04 ` [patch] drm/i915: precedence bug " Ville Syrjälä
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox