[PATCH:drm 1/4] Remove superfluous parentheses.

[PATCH:drm 1/4] Remove superfluous parentheses.

[Thomas Klausner]

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
---
 radeon/radeon_surface.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 109bd6b..9c3a192 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -282,7 +282,7 @@ static int r6_surface_init_linear(struct radeon_surface_manager *surf_man,
         surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -310,7 +310,7 @@ static int r6_surface_init_linear_aligned(struct radeon_surface_manager *surf_ma
         surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -343,7 +343,7 @@ static int r6_surface_init_1d(struct radeon_surface_manager *surf_man,
         surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -384,7 +384,7 @@ static int r6_surface_init_2d(struct radeon_surface_manager *surf_man,
         }
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -632,7 +632,7 @@ static int eg_surface_init_1d(struct radeon_surface_manager *surf_man,
         surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -685,7 +685,7 @@ static int eg_surface_init_2d(struct radeon_surface_manager *surf_man,
         }
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
     }
@@ -1524,7 +1524,7 @@ static int si_surface_init_linear_aligned(struct radeon_surface_manager *surf_ma
         si_surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, slice_align, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, surf->bo_alignment);
         }
         if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1567,7 +1567,7 @@ static int si_surface_init_1d(struct radeon_surface_manager *surf_man,
         si_surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, slice_align, offset);
         /* level0 and first mipmap need to have alignment */
         offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             offset = ALIGN(offset, alignment);
         }
         if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1669,7 +1669,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,
         }
         /* level0 and first mipmap need to have alignment */
         aligned_offset = offset = surf->bo_size;
-        if ((i == 0)) {
+        if (i == 0) {
             aligned_offset = ALIGN(aligned_offset, surf->bo_alignment);
         }
         if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
-- 
1.9.4

[PATCH:drm 2/4] Only define variable when it's used.

[Thomas Klausner]

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
---
 intel/test_decode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/intel/test_decode.c b/intel/test_decode.c
index b710f34..f9127cf 100644
--- a/intel/test_decode.c
+++ b/intel/test_decode.c
@@ -90,7 +90,10 @@ compare_batch(struct drm_intel_decode *ctx, const char *batch_filename)
 {
 	FILE *out = NULL;
 	void *ptr, *ref_ptr, *batch_ptr;
-	size_t size, ref_size, batch_size;
+#ifdef HAVE_OPEN_MEMSTREAM
+	size_t size;
+#endif
+	size_t ref_size, batch_size;
 	const char *ref_suffix = "-ref.txt";
 	char *ref_filename;
 
-- 
1.9.4

[PATCH:drm 3/4] Remove unused static function.

[Thomas Klausner]

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
---
 nouveau/bufctx.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nouveau/bufctx.c b/nouveau/bufctx.c
index 23d6f09..4f76e5d 100644
--- a/nouveau/bufctx.c
+++ b/nouveau/bufctx.c
@@ -44,12 +44,6 @@ struct nouveau_bufref_priv {
 	struct nouveau_bufctx *bufctx;
 };
 
-static inline struct nouveau_bufref_priv *
-nouveau_bufref(struct nouveau_bufref *bctx)
-{
-	return (struct nouveau_bufref_priv *)bctx;
-}
-
 struct nouveau_bufbin_priv {
 	struct nouveau_bufref_priv *list;
 	int relocs;
-- 
1.9.4

[PATCH:drm 4/4] Add missing header includes.

[Thomas Klausner]

unistd.h for close() and xf86drm.h for drmOpen().

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
---
 tests/radeon/radeon_ttm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index 246fd99..ac3297a 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -25,7 +25,9 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "rbo.h"
+#include "xf86drm.h"
 
 /* allocate as many single page bo to try to starve the kernel
  * memory zone (below highmem)
-- 
1.9.4

Re: [PATCH:drm 1/4] Remove superfluous parentheses.

[Michel Dänzer]

On 16.07.2014 02:22, Thomas Klausner wrote:
> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>

Patches 1 and 4 pushed with radeon: prefix added to the shortlog, thanks!


-- 
Earthling Michel Dänzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer