[PATCH 1/6] tests/drmstat: remove the test

[PATCH 1/6] tests/drmstat: remove the test

[Emil Velikov]

Known broken and no longer of any use after the remove of drm
procfs support from the kernel by

commit 151591c2828e18fde1eb8447874704f3422168b0
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed, 10 Jul 2013 09:46:12 +0000

    drm: remove procfs code, take 2

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

That commit is not strictly in a released kernel yet, so
one may prefer to delay this patch a bit.


 .gitignore        |   1 -
 tests/Makefile.am |   3 +-
 tests/drmstat.c   | 435 ------------------------------------------------------
 3 files changed, 1 insertion(+), 438 deletions(-)
 delete mode 100644 tests/drmstat.c

diff --git a/.gitignore b/.gitignore
index 5447f5c..ed288c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,6 @@ tdfx.kld
 via.kld
 tests/auth
 tests/dristat
-tests/drmstat
 tests/getclient
 tests/getstats
 tests/getversion
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd11491..1e70017 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,8 +7,7 @@ AM_CPPFLAGS = \
 LDADD = $(top_builddir)/libdrm.la
 
 check_PROGRAMS = \
-	dristat \
-	drmstat
+	dristat
 
 SUBDIRS = modeprint
 
diff --git a/tests/drmstat.c b/tests/drmstat.c
deleted file mode 100644
index 345b8d2..0000000
--- a/tests/drmstat.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/* drmstat.c -- DRM device status and testing program
- * Created: Tue Jan  5 08:19:24 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
- * 
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/mman.h>
-#include <getopt.h>
-#include <strings.h>
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-#include "xf86drm.h"
-
-/* Support gcc's __FUNCTION__ for people using other compilers */
-#if !defined(__GNUC__) && !defined(__FUNCTION__)
-# define __FUNCTION__ __func__ /* C99 */
-#endif
-
-int sigio_fd;
-
-static double usec(struct timeval *end, struct timeval *start)
-{
-    double e = end->tv_sec   * 1000000 + end->tv_usec;
-    double s = start->tv_sec * 1000000 + start->tv_usec;
-
-    return e - s;
-}
-
-static void getversion(int fd)
-{
-    drmVersionPtr version;
-    
-    version = drmGetVersion(fd);
-    if (version) {
-	printf( "Name: %s\n", version->name ? version->name : "?" );
-	printf( "    Version: %d.%d.%d\n",
-		version->version_major,
-		version->version_minor,
-		version->version_patchlevel );
-	printf( "    Date: %s\n", version->date ? version->date : "?" );
-	printf( "    Desc: %s\n", version->desc ? version->desc : "?" );
-	drmFreeVersion(version);
-    } else {
-	printf( "No driver available\n" );
-    }
-}
-	
-void handler(int fd, void *oldctx, void *newctx)
-{
-    printf("Got fd %d\n", fd);
-}
-
-void process_sigio(char *device)
-{
-    int              fd;
-
-    if ((fd = open(device, 0)) < 0) {
-	drmError(-errno, __FUNCTION__);
-	exit(1);
-    }
-
-    sigio_fd = fd;
-    /*  drmInstallSIGIOHandler(fd, handler); */
-    for (;;) sleep(60);
-}
-
-int main(int argc, char **argv)
-{
-    int            c;
-    int            r  = 0;
-    int            fd = -1;
-    drm_handle_t      handle;
-    void           *address;
-    char           *pt;
-    unsigned long  count;
-    unsigned long  offset;
-    unsigned long  size;
-    drm_context_t  context;
-    int            loops;
-    char           buf[1024];
-    int            i;
-    drmBufInfoPtr  info;
-    drmBufMapPtr   bufs;
-    drmLockPtr     lock;
-    int            secs;
-
-    while ((c = getopt(argc, argv,
-		       "lc:vo:O:f:s:w:W:b:r:R:P:L:C:XS:B:F:")) != EOF)
-	switch (c) {
-	case 'F':
-	    count  = strtoul(optarg, NULL, 0);
-	    if (!fork()) {
-		dup(fd);
-		sleep(count);
-	    }
-	    close(fd);
-	    break;
-	case 'v': getversion(fd);                                        break;
-	case 'X':
-	    if ((r = drmCreateContext(fd, &context))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf( "Got %d\n", context);
-	    break;
-	case 'S':
-	    process_sigio(optarg);
-	    break;
-	case 'C':
-	    if ((r = drmSwitchToContext(fd, strtoul(optarg, NULL, 0)))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    break;
-	case 'c':
-	    if ((r = drmSetBusid(fd,optarg))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    break;
-	case 'o':
-	    if ((fd = drmOpen(optarg, NULL)) < 0) {
-		drmError(fd, argv[0]);
-		return 1;
-	    }
-	    break;
-	case 'O':
-	    if ((fd = drmOpen(NULL, optarg)) < 0) {
-		drmError(fd, argv[0]);
-		return 1;
-	    }
-	    break;
-	case 'B':		/* Test buffer allocation */
-	    count  = strtoul(optarg, &pt, 0);
-	    size   = strtoul(pt+1, &pt, 0);
-	    secs   = strtoul(pt+1, NULL, 0);
-	    {
-		drmDMAReq      dma;
-		int            *indices, *sizes;
-
-		indices = alloca(sizeof(*indices) * count);
-		sizes   = alloca(sizeof(*sizes)   * count);
-		dma.context         = context;
-		dma.send_count      = 0;
-		dma.request_count   = count;
-		dma.request_size    = size;
-		dma.request_list    = indices;
-		dma.request_sizes   = sizes;
-		dma.flags           = DRM_DMA_WAIT;
-		if ((r = drmDMA(fd, &dma))) {
-		    drmError(r, argv[0]);
-		    return 1;
-		}
-		for (i = 0; i < dma.granted_count; i++) {
-		    printf("%5d: index = %d, size = %d\n",
-			   i, dma.request_list[i], dma.request_sizes[i]);
-		}
-		sleep(secs);
-		drmFreeBufs(fd, dma.granted_count, indices);
-	    }
-	    break;
-	case 'b':
-	    count   = strtoul(optarg, &pt, 0);
-	    size    = strtoul(pt+1, NULL, 0);
-	    if ((r = drmAddBufs(fd, count, size, 0, 65536)) < 0) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    if (!(info = drmGetBufInfo(fd))) {
-		drmError(0, argv[0]);
-		return 1;
-	    }
-	    for (i = 0; i < info->count; i++) {
-		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
-		       info->list[i].count,
-		       info->list[i].size,
-		       info->list[i].low_mark,
-		       info->list[i].high_mark);
-	    }
-	    if ((r = drmMarkBufs(fd, 0.50, 0.80))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    if (!(info = drmGetBufInfo(fd))) {
-		drmError(0, argv[0]);
-		return 1;
-	    }
-	    for (i = 0; i < info->count; i++) {
-		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
-		       info->list[i].count,
-		       info->list[i].size,
-		       info->list[i].low_mark,
-		       info->list[i].high_mark);
-	    }
-	    printf("===== /proc/dri/0/mem =====\n");
-	    sprintf(buf, "cat /proc/dri/0/mem");
-	    system(buf);
-#if 1
-	    if (!(bufs = drmMapBufs(fd))) {
-		drmError(0, argv[0]);
-		return 1;
-	    }
-	    printf("===============================\n");
-	    printf( "%d bufs\n", bufs->count);
-	    for (i = 0; i < bufs->count; i++) {
-		printf( "  %4d: %8d bytes at %p\n",
-			i,
-			bufs->list[i].total,
-			bufs->list[i].address);
-	    }
-	    printf("===== /proc/dri/0/vma =====\n");
-	    sprintf(buf, "cat /proc/dri/0/vma");
-	    system(buf);
-#endif
-	    break;
-	case 'f':
-	    offset  = strtoul(optarg, &pt, 0);
-	    size    = strtoul(pt+1, NULL, 0);
-	    handle  = 0;
-	    if ((r = drmAddMap(fd, offset, size,
-			       DRM_FRAME_BUFFER, 0, &handle))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf("0x%08lx:0x%04lx added\n", offset, size);
-	    printf("===== /proc/dri/0/mem =====\n");
-	    sprintf(buf, "cat /proc/dri/0/mem");
-	    system(buf);
-	    break;
-	case 'r':
-	case 'R':
-	    offset  = strtoul(optarg, &pt, 0);
-	    size    = strtoul(pt+1, NULL, 0);
-	    handle  = 0;
-	    if ((r = drmAddMap(fd, offset, size,
-			       DRM_REGISTERS,
-			       c == 'R' ? DRM_READ_ONLY : 0,
-			       &handle))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf("0x%08lx:0x%04lx added\n", offset, size);
-	    printf("===== /proc/dri/0/mem =====\n");
-	    sprintf(buf, "cat /proc/dri/0/mem");
-	    system(buf);
-	    break;
-	case 's':
-	    size = strtoul(optarg, &pt, 0);
-	    handle = 0;
-	    if ((r = drmAddMap(fd, 0, size,
-			       DRM_SHM, DRM_CONTAINS_LOCK,
-			       &handle))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf("0x%04lx byte shm added at 0x%08lx\n", size, handle);
-	    sprintf(buf, "cat /proc/dri/0/vm");
-	    system(buf);
-	    break;
-	case 'P':
-	    offset  = strtoul(optarg, &pt, 0);
-	    size    = strtoul(pt+1, NULL, 0);
-	    address = NULL;
-	    if ((r = drmMap(fd, offset, size, &address))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
-		   offset, size, address, getpid());
-	    printf("===== /proc/dri/0/vma =====\n");
-	    sprintf(buf, "cat /proc/dri/0/vma");
-	    system(buf);
-	    mprotect((void *)offset, size, PROT_READ);
-	    printf("===== /proc/dri/0/vma =====\n");
-	    sprintf(buf, "cat /proc/dri/0/vma");
-	    system(buf);
-	    break;
-	case 'w':
-	case 'W':
-	    offset  = strtoul(optarg, &pt, 0);
-	    size    = strtoul(pt+1, NULL, 0);
-	    address = NULL;
-	    if ((r = drmMap(fd, offset, size, &address))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
-		   offset, size, address, getpid());
-	    printf("===== /proc/%d/maps =====\n", getpid());
-	    sprintf(buf, "cat /proc/%d/maps", getpid());
-	    system(buf);
-	    printf("===== /proc/dri/0/mem =====\n");
-	    sprintf(buf, "cat /proc/dri/0/mem");
-	    system(buf);
-	    printf("===== /proc/dri/0/vma =====\n");
-	    sprintf(buf, "cat /proc/dri/0/vma");
-	    system(buf);
-	    printf("===== READING =====\n");
-	    for (i = 0; i < 0x10; i++)
-		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
-	    printf("\n");
-	    if (c == 'w') {
-		printf("===== WRITING =====\n");
-		for (i = 0; i < size; i+=2) {
-		    ((char *)address)[i]   = i & 0xff;
-		    ((char *)address)[i+1] = i & 0xff;
-		}
-	    }
-	    printf("===== READING =====\n");
-	    for (i = 0; i < 0x10; i++)
-		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
-	    printf("\n");
-	    printf("===== /proc/dri/0/vma =====\n");
-	    sprintf(buf, "cat /proc/dri/0/vma");
-	    system(buf);
-	    break;
-	case 'L':
-	    context = strtoul(optarg, &pt, 0);
-	    offset  = strtoul(pt+1, &pt, 0);
-	    size    = strtoul(pt+1, &pt, 0);
-	    loops   = strtoul(pt+1, NULL, 0);
-	    address = NULL;
-	    if ((r = drmMap(fd, offset, size, &address))) {
-		drmError(r, argv[0]);
-		return 1;
-	    }
-	    lock       = address;
-#if 1
-	    {
-		int            counter = 0;
-		struct timeval loop_start, loop_end;
-		struct timeval lock_start, lock_end;
-		double         wt;
-#define HISTOSIZE 9
-		int            histo[HISTOSIZE];
-		int            output = 0;
-		int            fast   = 0;
-
-		if (loops < 0) {
-		    loops = -loops;
-		    ++output;
-		}
-
-		for (i = 0; i < HISTOSIZE; i++) histo[i] = 0;
-
-		gettimeofday(&loop_start, NULL);
-		for (i = 0; i < loops; i++) {
-		    gettimeofday(&lock_start, NULL);
-		    DRM_LIGHT_LOCK_COUNT(fd,lock,context,fast);
-		    gettimeofday(&lock_end, NULL);
-		    DRM_UNLOCK(fd,lock,context);
-		    ++counter;
-		    wt = usec(&lock_end, &lock_start);
-		    if      (wt <=      2.5) ++histo[8];
-		    if      (wt <       5.0) ++histo[0];
-		    else if (wt <      50.0) ++histo[1];
-		    else if (wt <     500.0) ++histo[2];
-		    else if (wt <    5000.0) ++histo[3];
-		    else if (wt <   50000.0) ++histo[4];
-		    else if (wt <  500000.0) ++histo[5];
-		    else if (wt < 5000000.0) ++histo[6];
-		    else                     ++histo[7];
-		    if (output) printf( "%.2f uSec, %d fast\n", wt, fast);
-		}
-		gettimeofday(&loop_end, NULL);
-		printf( "Average wait time = %.2f usec, %d fast\n",
-			usec(&loop_end, &loop_start) /  counter, fast);
-		printf( "%9d <=     2.5 uS\n", histo[8]);
-		printf( "%9d <        5 uS\n", histo[0]);
-		printf( "%9d <       50 uS\n", histo[1]);
-		printf( "%9d <      500 uS\n", histo[2]);
-		printf( "%9d <     5000 uS\n", histo[3]);
-		printf( "%9d <    50000 uS\n", histo[4]);
-		printf( "%9d <   500000 uS\n", histo[5]);
-		printf( "%9d <  5000000 uS\n", histo[6]);
-		printf( "%9d >= 5000000 uS\n", histo[7]);
-	    }
-#else
-	    printf( "before lock: 0x%08x\n", lock->lock);
-	    printf( "lock: 0x%08x\n", lock->lock);
-	    sleep(5);
-	    printf( "unlock: 0x%08x\n", lock->lock);
-#endif
-	    break;
-	default:
-	    fprintf( stderr, "Usage: drmstat [options]\n" );
-	    return 1;
-	}
-
-    return r; 
-}
-
-void
-xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
-                va_list args)
-{
-	vfprintf(stderr, format, args);
-}
-
-int xf86ConfigDRI[10];
-- 
1.8.4

[PATCH 2/6] tests/*version: add missing string.h header

[Emil Velikov]

Prodives memset() and strlen(), used in tests/setversion
tests/getversion respectively.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 tests/getversion.c | 1 +
 tests/setversion.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/getversion.c b/tests/getversion.c
index 711d376..53d1d35 100644
--- a/tests/getversion.c
+++ b/tests/getversion.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include <string.h>
 #include "drmtest.h"
 
 /**
diff --git a/tests/setversion.c b/tests/setversion.c
index 3aaf7cc..5a5d01c 100644
--- a/tests/setversion.c
+++ b/tests/setversion.c
@@ -26,6 +26,7 @@
  */
 
 #include <limits.h>
+#include <string.h>
 #include "drmtest.h"
 
 /**
-- 
1.8.4

Re: [PATCH 2/6] tests/*version: add missing string.h header

[Rob Clark]

On Thu, Aug 29, 2013 at 4:31 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> Prodives memset() and strlen(), used in tests/setversion
> tests/getversion respectively.
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

Reviewed-by: Rob Clark <robdclark@gmail.com>

> ---
>  tests/getversion.c | 1 +
>  tests/setversion.c | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/tests/getversion.c b/tests/getversion.c
> index 711d376..53d1d35 100644
> --- a/tests/getversion.c
> +++ b/tests/getversion.c
> @@ -25,6 +25,7 @@
>   *
>   */
>
> +#include <string.h>
>  #include "drmtest.h"
>
>  /**
> diff --git a/tests/setversion.c b/tests/setversion.c
> index 3aaf7cc..5a5d01c 100644
> --- a/tests/setversion.c
> +++ b/tests/setversion.c
> @@ -26,6 +26,7 @@
>   */
>
>  #include <limits.h>
> +#include <string.h>
>  #include "drmtest.h"
>
>  /**
> --
> 1.8.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/6] tests/modetest: silence compiler warning about uninitialised variables

[Emil Velikov]

The compiler is unaware of that we have at least one crts/connector/plane
thus it complains that some of our variables will be used uninitialised.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

This patch looks like a rather silly thing to do, although it seems like
the only was to silence the gcc compiler
---
 tests/modetest/modetest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index f96b930..ed604b4 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -781,7 +781,7 @@ static struct crtc *pipe_find_crtc(struct device *dev, struct pipe_arg *pipe)
 
 static int pipe_find_crtc_and_mode(struct device *dev, struct pipe_arg *pipe)
 {
-	drmModeModeInfo *mode;
+	drmModeModeInfo *mode = NULL;
 	int i;
 
 	pipe->mode = NULL;
@@ -838,8 +838,8 @@ struct property_arg {
 
 static void set_property(struct device *dev, struct property_arg *p)
 {
-	drmModeObjectProperties *props;
-	drmModePropertyRes **props_info;
+	drmModeObjectProperties *props = NULL;
+	drmModePropertyRes **props_info = NULL;
 	const char *obj_type;
 	int ret;
 	int i;
-- 
1.8.4

Re: [PATCH 3/6] tests/modetest: silence compiler warning about uninitialised variables

[Rob Clark]

On Thu, Aug 29, 2013 at 4:31 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> The compiler is unaware of that we have at least one crts/connector/plane
> thus it complains that some of our variables will be used uninitialised.
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

Reviewed-by: Rob Clark <robdclark@gmail.com>

> ---
>
> This patch looks like a rather silly thing to do, although it seems like
> the only was to silence the gcc compiler
> ---
>  tests/modetest/modetest.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
> index f96b930..ed604b4 100644
> --- a/tests/modetest/modetest.c
> +++ b/tests/modetest/modetest.c
> @@ -781,7 +781,7 @@ static struct crtc *pipe_find_crtc(struct device *dev, struct pipe_arg *pipe)
>
>  static int pipe_find_crtc_and_mode(struct device *dev, struct pipe_arg *pipe)
>  {
> -       drmModeModeInfo *mode;
> +       drmModeModeInfo *mode = NULL;
>         int i;
>
>         pipe->mode = NULL;
> @@ -838,8 +838,8 @@ struct property_arg {
>
>  static void set_property(struct device *dev, struct property_arg *p)
>  {
> -       drmModeObjectProperties *props;
> -       drmModePropertyRes **props_info;
> +       drmModeObjectProperties *props = NULL;
> +       drmModePropertyRes **props_info = NULL;
>         const char *obj_type;
>         int ret;
>         int i;
> --
> 1.8.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 4/6] freedreno: use local drm.h over the system one

[Emil Velikov]

Otherwise build will fail, as drm/drm.h is not available.

Cc: Rob Clark <robclark@freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

Hello Rob,
I'm not entriely sure that this is correct as the libdrm code
is splinckled with variations of drm/drm.h drm.h in both quoted
and angle bracket form.

I believe that the chosen approach could be used througout libdrm
although such a change would be quite evasive and may lead to a
broken build.

This is what works for me, and looks approapriate IMHO

---
 freedreno/freedreno_priv.h | 2 +-
 freedreno/msm/msm_drm.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h
index b10ac90..69256f5 100644
--- a/freedreno/freedreno_priv.h
+++ b/freedreno/freedreno_priv.h
@@ -48,7 +48,7 @@
 
 #include "freedreno_drmif.h"
 #include "freedreno_ringbuffer.h"
-#include "drm/drm.h"
+#include "drm.h"
 
 struct fd_device_funcs {
 	int (*bo_new_handle)(struct fd_device *dev, uint32_t size,
diff --git a/freedreno/msm/msm_drm.h b/freedreno/msm/msm_drm.h
index d3c6207..090c724 100644
--- a/freedreno/msm/msm_drm.h
+++ b/freedreno/msm/msm_drm.h
@@ -19,7 +19,7 @@
 #define __MSM_DRM_H__
 
 #include <stddef.h>
-#include <drm/drm.h>
+#include "drm.h"
 
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints:
-- 
1.8.4

[PATCH 5/6] freedreno: set automake options to include subdir-objects

[Emil Velikov]

Handles automake complains about lack of forward-compatibility, due to the
source files in the kgsl and msm backends/folders.

Cc: Rob Clark <robclark@freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

I'm suspecting that the warning is caused as Archlinux always keeps track
with latest releases, whereas other distributions prefer to use a more
tested software

automake 1.14
autoconf 2.69
---

 freedreno/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index ec7e359..7903e5b 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS=subdir-objects
+
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
 	-I$(top_srcdir) \
-- 
1.8.4

Re: [PATCH 5/6] freedreno: set automake options to include subdir-objects

[Rob Clark]

On Thu, Aug 29, 2013 at 4:31 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> Handles automake complains about lack of forward-compatibility, due to the
> source files in the kgsl and msm backends/folders.
>
> Cc: Rob Clark <robclark@freedesktop.org>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

I've tested these two (this and 4/6).. they seem to work fine for me,
although I won't claim to be an automake guru, so couldn't actually
tell you if they are the "right" fixes.  I wouldn't mind a reviewed-by
from someone who does know automake better, but if no one speaks up
and says otherwise, I will apply/push them.

BR,
-R

> ---
>
> I'm suspecting that the warning is caused as Archlinux always keeps track
> with latest releases, whereas other distributions prefer to use a more
> tested software
>
> automake 1.14
> autoconf 2.69
> ---
>
>  freedreno/Makefile.am | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
> index ec7e359..7903e5b 100644
> --- a/freedreno/Makefile.am
> +++ b/freedreno/Makefile.am
> @@ -1,3 +1,5 @@
> +AUTOMAKE_OPTIONS=subdir-objects
> +
>  AM_CFLAGS = \
>         $(WARN_CFLAGS) \
>         -I$(top_srcdir) \
> --
> 1.8.4
>

[PATCH 6/6] intel: Update package name and description in libdrm_intel.pc

[Emil Velikov]

Currently the package name and description duplicate that of the
core libdrm. Update those to reflect reality.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

Trivial change IMHO, notices while checking the package Libs
---

 intel/libdrm_intel.pc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in
index 3ba6793..670e4fe 100644
--- a/intel/libdrm_intel.pc.in
+++ b/intel/libdrm_intel.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libdrm
-Description: Userspace interface to kernel DRM services
+Name: libdrm_intel
+Description: Userspace interface to intel kernel DRM services
 Version: @PACKAGE_VERSION@
 Requires: libdrm
 Libs: -L${libdir} -ldrm_intel
-- 
1.8.4

Re: [PATCH 6/6] intel: Update package name and description in libdrm_intel.pc

[Damien Lespiau]

On Thu, Aug 29, 2013 at 09:31:54PM +0100, Emil Velikov wrote:
> Currently the package name and description duplicate that of the
> core libdrm. Update those to reflect reality.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

Looks good to me:
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

-- 
Damien

> ---
> 
> Trivial change IMHO, notices while checking the package Libs
> ---
> 
>  intel/libdrm_intel.pc.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in
> index 3ba6793..670e4fe 100644
> --- a/intel/libdrm_intel.pc.in
> +++ b/intel/libdrm_intel.pc.in
> @@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
>  libdir=@libdir@
>  includedir=@includedir@
>  
> -Name: libdrm
> -Description: Userspace interface to kernel DRM services
> +Name: libdrm_intel
> +Description: Userspace interface to intel kernel DRM services
>  Version: @PACKAGE_VERSION@
>  Requires: libdrm
>  Libs: -L${libdir} -ldrm_intel
> -- 
> 1.8.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel