[RFC,i-g-t,5/9] tests/gem_ppgtt: Switched to new aliases of intel specific functions.

Commit Message

Robert Foss May 20, 2016, 10:59 p.m. UTC

From: Robert Foss <[e-mail]>

Switched from drm_XXX aliases drm_intel_XXX aliases for symbols where that
switch is possible.

Signed-off-by: Robert Foss <[e-mail]>
---
 tests/gem_ppgtt.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Emil Velikov May 23, 2016, 2:14 p.m. UTC | #1

On Friday, May 20, 2016 23:59 BST, [e-mail] wrote: 
> From: Robert Foss <[e-mail]>
> 
> Switched from drm_XXX aliases drm_intel_XXX aliases for symbols where that
> switch is possible.
> 
> Signed-off-by: Robert Foss <[e-mail]>
> ---
>  tests/gem_ppgtt.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
I could swear I've sent a similar looking patch... actually I have it only locally.

Reviewed-by: Emil Velikov <[e-mail]>

-Emil

Emil Velikov May 23, 2016, 2:15 p.m. UTC | #2

On Friday, May 20, 2016 23:59 BST, [e-mail] wrote: 
> From: Robert Foss <[e-mail]>
> 
> Switched from drm_XXX aliases drm_intel_XXX aliases for symbols where that
> switch is possible.
> 
> Signed-off-by: Robert Foss <[e-mail]>
> ---
>  tests/gem_ppgtt.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
Reviewed-by: Emil Velikov <[e-mail]>

-Emil

Daniel Vetter May 24, 2016, 8:03 a.m. UTC | #3

On Mon, May 23, 2016 at 03:15:26PM +0100, Emil Velikov wrote:
> On Friday, May 20, 2016 23:59 BST, [e-mail] wrote:
> > From: Robert Foss <[e-mail]>
> >
> > Switched from drm_XXX aliases drm_intel_XXX aliases for symbols where that
> > switch is possible.
> >
> > Signed-off-by: Robert Foss <[e-mail]>
> > ---
> >  tests/gem_ppgtt.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> >
> Reviewed-by: Emil Velikov <[e-mail]>

Applied, thanks.
-Daniel

Patch

diff --git a/tests/gem_ppgtt.c b/tests/gem_ppgtt.c
index 1a620ad..eb15ca5 100644
--- a/tests/gem_ppgtt.c
+++ b/tests/gem_ppgtt.c
@@ -74,11 +74,11 @@  static void scratch_buf_init(struct igt_buf *buf,
 
 static void scratch_buf_fini(struct igt_buf *buf)
 {
-	dri_bo_unreference(buf->bo);
+	drm_intel_bo_unreference(buf->bo);
 	memset(buf, 0, sizeof(*buf));
 }
 
-static void fork_rcs_copy(int target, dri_bo **dst, int count, unsigned flags)
+static void fork_rcs_copy(int target, drm_intel_bo **dst, int count, unsigned flags)
 #define CREATE_CONTEXT 0x1
 {
 	igt_render_copyfunc_t render_copy;
@@ -143,7 +143,7 @@  static void fork_rcs_copy(int target, dri_bo **dst, int count, unsigned flags)
 	}
 }
 
-static void fork_bcs_copy(int target, dri_bo **dst, int count)
+static void fork_bcs_copy(int target, drm_intel_bo **dst, int count)
 {
 	int devid;
 
@@ -167,7 +167,7 @@  static void fork_bcs_copy(int target, dri_bo **dst, int count)
 		igt_assert(batch);
 
 		for (int i = 0; i <= target; i++) {
-			dri_bo *src[2];
+			drm_intel_bo *src[2];
 
 			src[0] = create_bo(dst[child]->bufmgr,
 					   ~0);
@@ -177,13 +177,13 @@  static void fork_bcs_copy(int target, dri_bo **dst, int count)
 			intel_copy_bo(batch, src[0], src[1], SIZE);
 			intel_copy_bo(batch, dst[child], src[0], SIZE);
 
-			dri_bo_unreference(src[1]);
-			dri_bo_unreference(src[0]);
+			drm_intel_bo_unreference(src[1]);
+			drm_intel_bo_unreference(src[0]);
 		}
 	}
 }
 
-static void surfaces_check(dri_bo **bo, int count, uint32_t expected)
+static void surfaces_check(drm_intel_bo **bo, int count, uint32_t expected)
 {
 	for (int child = 0; child < count; child++) {
 		uint32_t *ptr;
@@ -322,7 +322,7 @@  int main(int argc, char **argv)
 	igt_subtest_init(argc, argv);
 
 	igt_subtest("blt-vs-render-ctx0") {
-		dri_bo *bcs[1], *rcs[N_CHILD];
+		drm_intel_bo *bcs[1], *rcs[N_CHILD];
 
 		fork_bcs_copy(0x4000, bcs, 1);
 		fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, 0);
@@ -334,7 +334,7 @@  int main(int argc, char **argv)
 	}
 
 	igt_subtest("blt-vs-render-ctxN") {
-		dri_bo *bcs[1], *rcs[N_CHILD];
+		drm_intel_bo *bcs[1], *rcs[N_CHILD];
 
 		fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, CREATE_CONTEXT);
 		fork_bcs_copy(0x4000, bcs, 1);