[PATCH] lib: fix #define max

[PATCH] lib: fix #define max

[Mika Kuoppala]

Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b
Author: Thomas Wood <thomas.wood@intel.com>
Date:   Fri Oct 10 11:20:35 2014 +0100

    lib: add common min and max macros

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218
Tested-by: Guo Jinxian <jinxianx.guo@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 lib/igt_aux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index 415614b..9b42918 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -85,6 +85,6 @@ bool intel_check_memory(uint32_t count, uint32_t size, unsigned mode);
 
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
 
 #endif /* IGT_AUX_H */
-- 
1.9.1

[PATCH] lib: fix #define max

[Mika Kuoppala]

Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b
Author: Thomas Wood <thomas.wood@intel.com>
Date:   Fri Oct 10 11:20:35 2014 +0100

    lib: add common min and max macros

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218
Tested-by: Guo Jinxian <jinxianx.guo@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 lib/igt_aux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index 415614b..9b42918 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -85,6 +85,6 @@ bool intel_check_memory(uint32_t count, uint32_t size, unsigned mode);
 
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
 
 #endif /* IGT_AUX_H */
-- 
1.9.1

Re: [PATCH] lib: fix #define max

[Jani Nikula]

On Tue, 21 Oct 2014, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
> Regression from:
>
> commit be4710a541b517b5f8663448bffed5656d59b47b
> Author: Thomas Wood <thomas.wood@intel.com>
> Date:   Fri Oct 10 11:20:35 2014 +0100
>
>     lib: add common min and max macros
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218
> Tested-by: Guo Jinxian <jinxianx.guo@intel.com>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

Push it already!

> ---
>  lib/igt_aux.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/igt_aux.h b/lib/igt_aux.h
> index 415614b..9b42918 100644
> --- a/lib/igt_aux.h
> +++ b/lib/igt_aux.h
> @@ -85,6 +85,6 @@ bool intel_check_memory(uint32_t count, uint32_t size, unsigned mode);
>  
>  
>  #define min(a, b) ((a) < (b) ? (a) : (b))
> -#define max(a, b) ((a) < (b) ? (a) : (b))
> +#define max(a, b) ((a) > (b) ? (a) : (b))
>  
>  #endif /* IGT_AUX_H */
> -- 
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center

Re: [PATCH] lib: fix #define max

[Daniel Vetter]

On Wed, Oct 22, 2014 at 09:32:23PM +0300, Jani Nikula wrote:
> On Tue, 21 Oct 2014, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
> > Regression from:
> >
> > commit be4710a541b517b5f8663448bffed5656d59b47b
> > Author: Thomas Wood <thomas.wood@intel.com>
> > Date:   Fri Oct 10 11:20:35 2014 +0100
> >
> >     lib: add common min and max macros
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218
> > Tested-by: Guo Jinxian <jinxianx.guo@intel.com>
> > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> 
> Push it already!

To clarify igt process: If you're patch has been sitting on the m-l for a
day or so without objection, just push it. If it's critical (like this
one) and you're confident it's good push right after sending.

Submitting to intel-gfx for igt patches is mostly so that other people can
watch what flies by and drop suggestions for later improvements. And of
course new contributors get the full review treatment to make sure they
use all the nice stuff the testsuite provides properly.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch