Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: tim.gore@intel.com
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] intel-gpu-tools: remove testdisplay.h from kms_render.c
Date: Tue,  3 Jun 2014 15:18:31 +0100	[thread overview]
Message-ID: <1401805111-31965-1-git-send-email-tim.gore@intel.com> (raw)

From: Tim Gore <tim.gore@intel.com>

kms_render.c included testdisplay.h but did not need it.
This was preventing it from building on Android due to the
lack of a Glib port. So I have removed this #include and
changed Android.mk so that kms_render is built if we have
cairo.

Signed-off-by: Tim Gore <tim.gore@intel.com>
---
 tests/Android.mk   | 4 ++--
 tests/kms_render.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 6e9dc67..3fd32f5 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -31,7 +31,6 @@ skip_tests_list :=
 skip_tests_list += gem_seqno_wrap
 skip_tests_list += testdisplay        # needs glib.h
 skip_tests_list += pm_rpm
-skip_tests_list += kms_render         # needs glib.h
 
 # set local compilation flags for IGT tests
 IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG
@@ -69,7 +68,8 @@ else
     gem_render_copy \
     pm_lpsp \
     kms_fence_pin_leak \
-    kms_mmio_vs_cs_flip
+    kms_mmio_vs_cs_flip \
+    kms_render
     IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0
 endif
 
diff --git a/tests/kms_render.c b/tests/kms_render.c
index d9c0a58..6c742e2 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -31,7 +31,6 @@
 #include <sys/time.h>
 
 #include "drmtest.h"
-#include "testdisplay.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_io.h"
-- 
1.9.2

             reply	other threads:[~2014-06-03 14:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-03 14:18 tim.gore [this message]
2014-06-03 14:37 ` [PATCH] intel-gpu-tools: remove testdisplay.h from kms_render.c Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401805111-31965-1-git-send-email-tim.gore@intel.com \
    --to=tim.gore@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox