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; }
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
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; }
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
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
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
dri-devel@lists.freedesktop.org
-
Chris Wilson -
Dan Carpenter -
Daniel Vetter -
Ville Syrjälä