From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] intel-gpu-tools: remove testdisplay.h from
 kms_render.c
Date: Tue, 3 Jun 2014 16:37:34 +0200
Message-ID: <20140603143734.GH7416@phenom.ffwll.local>
References: <1401805111-31965-1-git-send-email-tim.gore@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com
 [209.85.212.172])
 by gabe.freedesktop.org (Postfix) with ESMTP id 1FACC6E3D1
 for <intel-gfx@lists.freedesktop.org>; Tue,  3 Jun 2014 07:37:37 -0700 (PDT)
Received: by mail-wi0-f172.google.com with SMTP id hi2so6703768wib.5
 for <intel-gfx@lists.freedesktop.org>; Tue, 03 Jun 2014 07:37:37 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1401805111-31965-1-git-send-email-tim.gore@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: tim.gore@intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Tue, Jun 03, 2014 at 03:18:31PM +0100, tim.gore@intel.com wrote:
> 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>

Both patches merged, thanks.
-Daniel

> ---
>  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
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch