[PATCH libdrm 0/8] Warnings fixes

[PATCH libdrm 0/8] Warnings fixes

[Jan Vesely]

His series fixes most of the warnings my compiler spits out running
make distcheck.
Most of the changes do not change behaviour and those the do are in separate
patches.
After this series I'm left with:
      1 -Wempty-body
      1 -Wformat
      1 -Wpointer-to-int-cast
      1 -Wsign-compare

Jan Vesely (8):
  Add static qualifier to local functions
  tests: String literals are const char *
  Fix type-limits, pointer-arith and sign-compare warnings
  xf86drmSL: Fix neighbour printing
  Fix aliasing and switch-enum warnings
  dristat: Handle DRM_CONSISTENT
  Fix unused, and unused-but-set variables warnings
  Fix unused function warnings

 tests/dristat.c                   |  5 +++--
 tests/drmstat.c                   | 15 +++++----------
 tests/exynos/exynos_fimg2d_test.c |  7 ++++---
 tests/getstats.c                  |  2 --
 tests/kmstest/main.c              |  4 ++--
 tests/modeprint/modeprint.c       | 19 ++++++++++---------
 tests/proptest/proptest.c         |  4 ++--
 tests/radeon/radeon_ttm.c         |  4 ++--
 tests/vbltest/vbltest.c           |  2 +-
 xf86drm.c                         | 17 ++++++++---------
 xf86drmMode.c                     |  4 ++--
 xf86drmSL.c                       |  7 +++++--
 12 files changed, 44 insertions(+), 46 deletions(-)

-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 1/8] Add static qualifier to local functions

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/drmstat.c             |  8 ++++----
 tests/kmstest/main.c        |  2 +-
 tests/modeprint/modeprint.c | 18 +++++++++---------
 tests/proptest/proptest.c   |  2 +-
 tests/radeon/radeon_ttm.c   |  4 ++--
 xf86drm.c                   |  2 +-
 xf86drmMode.c               |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/drmstat.c b/tests/drmstat.c
index 5935d07..36cc70d 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -81,13 +81,13 @@ static void getversion(int fd)
 	printf( "No driver available\n" );
     }
 }
-	
-void handler(int fd, void *oldctx, void *newctx)
+
+static void handler(int fd, void *oldctx, void *newctx)
 {
     printf("Got fd %d\n", fd);
 }
 
-void process_sigio(char *device)
+static void process_sigio(char *device)
 {
     int              fd;
 
@@ -427,7 +427,7 @@ int main(int argc, char **argv)
     return r; 
 }
 
-void DRM_PRINTFLIKE(4, 0)
+static void DRM_PRINTFLIKE(4, 0)
 xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
                 va_list args)
 {
diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index 2c87b1c..d8c6c1f 100644
--- a/tests/kmstest/main.c
+++ b/tests/kmstest/main.c
@@ -37,7 +37,7 @@
 		return ret; \
 	}
 
-int test_bo(struct kms_driver *kms)
+static int test_bo(struct kms_driver *kms)
 {
 	struct kms_bo *bo;
 	int ret;
diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
index 6f0d039..de59cbd 100644
--- a/tests/modeprint/modeprint.c
+++ b/tests/modeprint/modeprint.c
@@ -53,7 +53,7 @@ int crtcs;
 int fbs;
 char *module_name;
 
-const char* getConnectionText(drmModeConnection conn)
+static const char* getConnectionText(drmModeConnection conn)
 {
 	switch (conn) {
 	case DRM_MODE_CONNECTED:
@@ -66,7 +66,7 @@ const char* getConnectionText(drmModeConnection conn)
 
 }
 
-int printMode(struct drm_mode_modeinfo *mode)
+static int printMode(struct drm_mode_modeinfo *mode)
 {
 	if (full_modes) {
 		printf("Mode: %s\n", mode->name);
@@ -90,7 +90,7 @@ int printMode(struct drm_mode_modeinfo *mode)
 	return 0;
 }
 
-int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
+static int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
 {
 	const char *name = NULL;
 	int j;
@@ -161,7 +161,7 @@ static const char * const output_names[] = { "None",
 					     "DSI",
 };
 
-int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
+static int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
 {
 	int i = 0;
 	struct drm_mode_modeinfo *mode = NULL;
@@ -214,7 +214,7 @@ int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uin
 	return 0;
 }
 
-int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
+static int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
 {
 	printf("Encoder\n");
 	printf("\tid     :%i\n", id);
@@ -225,7 +225,7 @@ int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t
 	return 0;
 }
 
-int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
+static int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 {
 	printf("Crtc\n");
 	printf("\tid             : %i\n", id);
@@ -239,7 +239,7 @@ int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 	return 0;
 }
 
-int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
+static int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 {
 	printf("Framebuffer\n");
 	printf("\thandle    : %i\n", fb->handle);
@@ -253,7 +253,7 @@ int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 	return 0;
 }
 
-int printRes(int fd, drmModeResPtr res)
+static int printRes(int fd, drmModeResPtr res)
 {
 	int i;
 	drmModeFBPtr fb;
@@ -329,7 +329,7 @@ int printRes(int fd, drmModeResPtr res)
 	return 0;
 }
 
-void args(int argc, char **argv)
+static void args(int argc, char **argv)
 {
 	int i;
 
diff --git a/tests/proptest/proptest.c b/tests/proptest/proptest.c
index 7618f63..3496065 100644
--- a/tests/proptest/proptest.c
+++ b/tests/proptest/proptest.c
@@ -44,7 +44,7 @@ static inline int64_t U642I64(uint64_t val)
 int fd;
 drmModeResPtr res = NULL;
 
-const char *connector_type_str(uint32_t type)
+static const char *connector_type_str(uint32_t type)
 {
 	switch (type) {
 	case DRM_MODE_CONNECTOR_Unknown:
diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index ac3297a..8346e85 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -32,7 +32,7 @@
 /* allocate as many single page bo to try to starve the kernel
  * memory zone (below highmem)
  */
-void ttm_starve_kernel_private_memory(int fd)
+static void ttm_starve_kernel_private_memory(int fd)
 {
     struct list_head list;
     struct rbo *bo, *tmp;
@@ -55,7 +55,7 @@ void ttm_starve_kernel_private_memory(int fd)
     }
 }
 
-int radeon_open_fd(void)
+static int radeon_open_fd(void)
 {
     return drmOpen("radeon", NULL);
 }
diff --git a/xf86drm.c b/xf86drm.c
index e117bc6..016247f 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -131,7 +131,7 @@ drmMsg(const char *format, ...)
     }
 }
 
-void
+static void
 drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
 {
     drm_debug_print = debug_msg_ptr;
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 9ea8fe7..1c06a19 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
  * Util functions
  */
 
-void* drmAllocCpy(void *array, int count, int entry_size)
+static void* drmAllocCpy(void *array, int count, int entry_size)
 {
 	char *r;
 	int i;
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 1/8] Add static qualifier to local functions

[Emil Velikov]

On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> ---
>  tests/drmstat.c             |  8 ++++----
>  tests/kmstest/main.c        |  2 +-
>  tests/modeprint/modeprint.c | 18 +++++++++---------
>  tests/proptest/proptest.c   |  2 +-
>  tests/radeon/radeon_ttm.c   |  4 ++--
>  xf86drm.c                   |  2 +-
>  xf86drmMode.c               |  2 +-
>  7 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/tests/drmstat.c b/tests/drmstat.c
> index 5935d07..36cc70d 100644
> --- a/tests/drmstat.c
> +++ b/tests/drmstat.c
> @@ -81,13 +81,13 @@ static void getversion(int fd)
>         printf( "No driver available\n" );
>      }
>  }
> -
> -void handler(int fd, void *oldctx, void *newctx)
> +
> +static void handler(int fd, void *oldctx, void *newctx)
>  {
>      printf("Got fd %d\n", fd);
>  }
>
It's only "user" was commented out as a transition to libdrm2 afaict.
Should be safe to nuke alongside the commented out caller.

> -void process_sigio(char *device)
> +static void process_sigio(char *device)
>  {
>      int              fd;
>
> @@ -427,7 +427,7 @@ int main(int argc, char **argv)
>      return r;
>  }
>
> -void DRM_PRINTFLIKE(4, 0)
> +static void DRM_PRINTFLIKE(4, 0)
>  xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
>                  va_list args)
Think don't need to bother making this static and just nuke it. It
seems like it was added by mistake (commit c3092ead642) and never
used.

...
> diff --git a/xf86drm.c b/xf86drm.c
> index e117bc6..016247f 100644
> --- a/xf86drm.c
> +++ b/xf86drm.c
> @@ -131,7 +131,7 @@ drmMsg(const char *format, ...)
>      }
>  }
>
> -void
> +static void
>  drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
>  {
>      drm_debug_print = debug_msg_ptr;
> diff --git a/xf86drmMode.c b/xf86drmMode.c
> index 9ea8fe7..1c06a19 100644
> --- a/xf86drmMode.c
> +++ b/xf86drmMode.c
> @@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
>   * Util functions
>   */
>
> -void* drmAllocCpy(void *array, int count, int entry_size)
> +static void* drmAllocCpy(void *array, int count, int entry_size)
Strictly speaking these could still be used, despite never being part
of the API. Although my vote (fwiw) would be to that we're safe.

Cheers,
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 1/8] Add static qualifier to local functions

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 2916 bytes --]

On Fri, 2015-03-13 at 23:07 +0000, Emil Velikov wrote:
> On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> > Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> > ---
> >  tests/drmstat.c             |  8 ++++----
> >  tests/kmstest/main.c        |  2 +-
> >  tests/modeprint/modeprint.c | 18 +++++++++---------
> >  tests/proptest/proptest.c   |  2 +-
> >  tests/radeon/radeon_ttm.c   |  4 ++--
> >  xf86drm.c                   |  2 +-
> >  xf86drmMode.c               |  2 +-
> >  7 files changed, 19 insertions(+), 19 deletions(-)
> >
> > diff --git a/tests/drmstat.c b/tests/drmstat.c
> > index 5935d07..36cc70d 100644
> > --- a/tests/drmstat.c
> > +++ b/tests/drmstat.c
> > @@ -81,13 +81,13 @@ static void getversion(int fd)
> >         printf( "No driver available\n" );
> >      }
> >  }
> > -
> > -void handler(int fd, void *oldctx, void *newctx)
> > +
> > +static void handler(int fd, void *oldctx, void *newctx)
> >  {
> >      printf("Got fd %d\n", fd);
> >  }
> >
> It's only "user" was commented out as a transition to libdrm2 afaict.
> Should be safe to nuke alongside the commented out caller.

This one got commented out in 8/8 if you prefer I can nuke it, and apply
8/8 before this one.

> 
> > -void process_sigio(char *device)
> > +static void process_sigio(char *device)
> >  {
> >      int              fd;
> >
> > @@ -427,7 +427,7 @@ int main(int argc, char **argv)
> >      return r;
> >  }
> >
> > -void DRM_PRINTFLIKE(4, 0)
> > +static void DRM_PRINTFLIKE(4, 0)
> >  xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
> >                  va_list args)
> Think don't need to bother making this static and just nuke it. It
> seems like it was added by mistake (commit c3092ead642) and never
> used.

same here. it is removed in 8/8 I can reorder the patches tog et rid of
this artifact

> 
> ...
> > diff --git a/xf86drm.c b/xf86drm.c
> > index e117bc6..016247f 100644
> > --- a/xf86drm.c
> > +++ b/xf86drm.c
> > @@ -131,7 +131,7 @@ drmMsg(const char *format, ...)
> >      }
> >  }
> >
> > -void
> > +static void
> >  drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
> >  {
> >      drm_debug_print = debug_msg_ptr;
> > diff --git a/xf86drmMode.c b/xf86drmMode.c
> > index 9ea8fe7..1c06a19 100644
> > --- a/xf86drmMode.c
> > +++ b/xf86drmMode.c
> > @@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
> >   * Util functions
> >   */
> >
> > -void* drmAllocCpy(void *array, int count, int entry_size)
> > +static void* drmAllocCpy(void *array, int count, int entry_size)
> Strictly speaking these could still be used, despite never being part
> of the API. Although my vote (fwiw) would be to that we're safe.

This one is heavily used in the same file.

> 
> Cheers,
> Emil

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 1/8] Add static qualifier to local functions

[Emil Velikov]

On 14/03/15 00:08, Jan Vesely wrote:
> On Fri, 2015-03-13 at 23:07 +0000, Emil Velikov wrote:
>> On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
>>> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
>>> ---
>>>  tests/drmstat.c             |  8 ++++----
>>>  tests/kmstest/main.c        |  2 +-
>>>  tests/modeprint/modeprint.c | 18 +++++++++---------
>>>  tests/proptest/proptest.c   |  2 +-
>>>  tests/radeon/radeon_ttm.c   |  4 ++--
>>>  xf86drm.c                   |  2 +-
>>>  xf86drmMode.c               |  2 +-
>>>  7 files changed, 19 insertions(+), 19 deletions(-)
>>>
>>> diff --git a/tests/drmstat.c b/tests/drmstat.c
>>> index 5935d07..36cc70d 100644
>>> --- a/tests/drmstat.c
>>> +++ b/tests/drmstat.c
>>> @@ -81,13 +81,13 @@ static void getversion(int fd)
>>>         printf( "No driver available\n" );
>>>      }
>>>  }
>>> -
>>> -void handler(int fd, void *oldctx, void *newctx)
>>> +
>>> +static void handler(int fd, void *oldctx, void *newctx)
>>>  {
>>>      printf("Got fd %d\n", fd);
>>>  }
>>>
>> It's only "user" was commented out as a transition to libdrm2 afaict.
>> Should be safe to nuke alongside the commented out caller.
> 
> This one got commented out in 8/8 if you prefer I can nuke it, and apply
> 8/8 before this one.
> 
>>
>>> -void process_sigio(char *device)
>>> +static void process_sigio(char *device)
>>>  {
>>>      int              fd;
>>>
>>> @@ -427,7 +427,7 @@ int main(int argc, char **argv)
>>>      return r;
>>>  }
>>>
>>> -void DRM_PRINTFLIKE(4, 0)
>>> +static void DRM_PRINTFLIKE(4, 0)
>>>  xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
>>>                  va_list args)
>> Think don't need to bother making this static and just nuke it. It
>> seems like it was added by mistake (commit c3092ead642) and never
>> used.
> 
> same here. it is removed in 8/8 I can reorder the patches tog et rid of
> this artifact
> 
That's exactly I was thinking. They seems toe be unused for 4+ years so
might as well kill them off in a single blow.

>>
>> ...
>>> diff --git a/xf86drm.c b/xf86drm.c
>>> index e117bc6..016247f 100644
>>> --- a/xf86drm.c
>>> +++ b/xf86drm.c
>>> @@ -131,7 +131,7 @@ drmMsg(const char *format, ...)
>>>      }
>>>  }
>>>
>>> -void
>>> +static void
>>>  drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
>>>  {
>>>      drm_debug_print = debug_msg_ptr;
>>> diff --git a/xf86drmMode.c b/xf86drmMode.c
>>> index 9ea8fe7..1c06a19 100644
>>> --- a/xf86drmMode.c
>>> +++ b/xf86drmMode.c
>>> @@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
>>>   * Util functions
>>>   */
>>>
>>> -void* drmAllocCpy(void *array, int count, int entry_size)
>>> +static void* drmAllocCpy(void *array, int count, int entry_size)
>> Strictly speaking these could still be used, despite never being part
>> of the API. Although my vote (fwiw) would be to that we're safe.
> 
> This one is heavily used in the same file.
> 
I might have been a bit vague there. I'm not saying a word against any
of it, just pointing out that there is a very small chance it may break
some unusual apps.


-Emil

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm v2 1/8] Add static qualifier to local functions

[Jan Vesely]

v2: Don't bother marking dead functions static
    (handler, xf86VDrvMsgVerb, drmSetDebugMsgFunction)

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/drmstat.c             |  2 +-
 tests/kmstest/main.c        |  2 +-
 tests/modeprint/modeprint.c | 18 +++++++++---------
 tests/proptest/proptest.c   |  2 +-
 tests/radeon/radeon_ttm.c   |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/drmstat.c b/tests/drmstat.c
index 0ed5caf..c800ebb 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -82,7 +82,7 @@ static void getversion(int fd)
     }
 }
 
-void process_sigio(char *device)
+static void process_sigio(char *device)
 {
     int              fd;
 
diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index 59e6113..1d4c63e 100644
--- a/tests/kmstest/main.c
+++ b/tests/kmstest/main.c
@@ -37,7 +37,7 @@
 		return ret; \
 	}
 
-int test_bo(struct kms_driver *kms)
+static int test_bo(struct kms_driver *kms)
 {
 	struct kms_bo *bo;
 	int ret;
diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
index 2d998d5..508c9f2 100644
--- a/tests/modeprint/modeprint.c
+++ b/tests/modeprint/modeprint.c
@@ -53,7 +53,7 @@ int crtcs;
 int fbs;
 char *module_name;
 
-const char* getConnectionText(drmModeConnection conn)
+static const char* getConnectionText(drmModeConnection conn)
 {
 	switch (conn) {
 	case DRM_MODE_CONNECTED:
@@ -67,7 +67,7 @@ const char* getConnectionText(drmModeConnection conn)
 
 }
 
-int printMode(struct drm_mode_modeinfo *mode)
+static int printMode(struct drm_mode_modeinfo *mode)
 {
 	if (full_modes) {
 		printf("Mode: %s\n", mode->name);
@@ -91,7 +91,7 @@ int printMode(struct drm_mode_modeinfo *mode)
 	return 0;
 }
 
-int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
+static int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
 {
 	const char *name = NULL;
 	int j;
@@ -162,7 +162,7 @@ static const char * const output_names[] = { "None",
 					     "DSI",
 };
 
-int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
+static int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
 {
 	int i = 0;
 	struct drm_mode_modeinfo *mode = NULL;
@@ -215,7 +215,7 @@ int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uin
 	return 0;
 }
 
-int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
+static int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
 {
 	printf("Encoder\n");
 	printf("\tid     :%i\n", id);
@@ -226,7 +226,7 @@ int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t
 	return 0;
 }
 
-int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
+static int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 {
 	printf("Crtc\n");
 	printf("\tid             : %i\n", id);
@@ -240,7 +240,7 @@ int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 	return 0;
 }
 
-int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
+static int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 {
 	printf("Framebuffer\n");
 	printf("\thandle    : %i\n", fb->handle);
@@ -254,7 +254,7 @@ int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 	return 0;
 }
 
-int printRes(int fd, drmModeResPtr res)
+static int printRes(int fd, drmModeResPtr res)
 {
 	int i;
 	drmModeFBPtr fb;
@@ -330,7 +330,7 @@ int printRes(int fd, drmModeResPtr res)
 	return 0;
 }
 
-void args(int argc, char **argv)
+static void args(int argc, char **argv)
 {
 	int i;
 
diff --git a/tests/proptest/proptest.c b/tests/proptest/proptest.c
index 4b7234d..9b2eb3f 100644
--- a/tests/proptest/proptest.c
+++ b/tests/proptest/proptest.c
@@ -44,7 +44,7 @@ static inline int64_t U642I64(uint64_t val)
 int fd;
 drmModeResPtr res = NULL;
 
-const char *connector_type_str(uint32_t type)
+static const char *connector_type_str(uint32_t type)
 {
 	switch (type) {
 	case DRM_MODE_CONNECTOR_Unknown:
diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index ac3297a..8346e85 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -32,7 +32,7 @@
 /* allocate as many single page bo to try to starve the kernel
  * memory zone (below highmem)
  */
-void ttm_starve_kernel_private_memory(int fd)
+static void ttm_starve_kernel_private_memory(int fd)
 {
     struct list_head list;
     struct rbo *bo, *tmp;
@@ -55,7 +55,7 @@ void ttm_starve_kernel_private_memory(int fd)
     }
 }
 
-int radeon_open_fd(void)
+static int radeon_open_fd(void)
 {
     return drmOpen("radeon", NULL);
 }
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm v2 1/8] Add static qualifier to local functions

[Emil Velikov]

On 15/03/15 18:09, Jan Vesely wrote:
> v2: Don't bother marking dead functions static
>     (handler, xf86VDrvMsgVerb, drmSetDebugMsgFunction)
> 
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

Thanks
Emil

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 2/8] tests: String literals are const char *

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/kmstest/main.c      | 2 +-
 tests/proptest/proptest.c | 2 +-
 tests/vbltest/vbltest.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index d8c6c1f..1d4c63e 100644
--- a/tests/kmstest/main.c
+++ b/tests/kmstest/main.c
@@ -56,7 +56,7 @@ static int test_bo(struct kms_driver *kms)
 	return 0;
 }
 
-char *drivers[] = {
+static const char *drivers[] = {
 	"i915",
 	"radeon",
 	"nouveau",
diff --git a/tests/proptest/proptest.c b/tests/proptest/proptest.c
index 3496065..9b2eb3f 100644
--- a/tests/proptest/proptest.c
+++ b/tests/proptest/proptest.c
@@ -303,7 +303,7 @@ static void printUsage(void)
 
 int main(int argc, char *argv[])
 {
-	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
+	const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
 	unsigned int i, ret = 0;
 
 	for (i = 0; i < ARRAY_SIZE(modules); i++){
diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
index 916d494..02fefbf 100644
--- a/tests/vbltest/vbltest.c
+++ b/tests/vbltest/vbltest.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 {
 	unsigned i;
 	int c, fd, ret;
-	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" };
+	const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" };
 	drmVBlank vbl;
 	drmEventContext evctx;
 	struct vbl_info handler_info;
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 3/8] Fix type-limits, pointer-arith and sign-compare warnings

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/dristat.c  | 4 ++--
 tests/getstats.c | 2 --
 xf86drmMode.c    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/dristat.c b/tests/dristat.c
index 449aa24..992ceb4 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -189,9 +189,9 @@ static void printhuman(unsigned long value, const char *name, int mult)
 static void getstats(int fd, int i)
 {
     drmStatsT prev, curr;
-    int       j;
+    unsigned  j;
     double    rate;
-    
+
     printf("  System statistics:\n");
 
     if (drmGetStats(fd, &prev)) return;
diff --git a/tests/getstats.c b/tests/getstats.c
index 8d40d0b..8a7d299 100644
--- a/tests/getstats.c
+++ b/tests/getstats.c
@@ -45,8 +45,6 @@ int main(int argc, char **argv)
 	ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
 	assert(ret == 0);
 
-	assert(stats.count >= 0);
-
 	close(fd);
 	return 0;
 }
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 1c06a19..61d5e01 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
  * Util functions
  */
 
-static void* drmAllocCpy(void *array, int count, int entry_size)
+static void* drmAllocCpy(char *array, int count, int entry_size)
 {
 	char *r;
 	int i;
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 xf86drmSL.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xf86drmSL.c b/xf86drmSL.c
index acddb54..2160bb8 100644
--- a/xf86drmSL.c
+++ b/xf86drmSL.c
@@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
     SkipListPtr   list = (SkipListPtr)l;
     SLEntryPtr    update[SL_MAX_LEVEL + 1];
     int           retcode = 0;
+    SLEntryPtr    entry;
+
+    entry = SLLocate(list, key, update);
 
     *prev_key   = *next_key   = key;
     *prev_value = *next_value = NULL;
-	
-    if (update[0]) {
+
+    if (entry && update[0]) {
 	*prev_key   = update[0]->key;
 	*prev_value = update[0]->value;
 	++retcode;
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 1082 bytes --]

Hi Kristian,

this patch partially reverts e4a519635:
Tidy up compile warnings by cleaning up types.

it looks to me that the xf86drmSL.c bits slipped in by accident.

thanks,
Jan

On Fri, 2015-02-27 at 13:07 -0500, Jan Vesely wrote:
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> ---
>  xf86drmSL.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/xf86drmSL.c b/xf86drmSL.c
> index acddb54..2160bb8 100644
> --- a/xf86drmSL.c
> +++ b/xf86drmSL.c
> @@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
>      SkipListPtr   list = (SkipListPtr)l;
>      SLEntryPtr    update[SL_MAX_LEVEL + 1];
>      int           retcode = 0;
> +    SLEntryPtr    entry;
> +
> +    entry = SLLocate(list, key, update);
>  
>      *prev_key   = *next_key   = key;
>      *prev_value = *next_value = NULL;
> -	
> -    if (update[0]) {
> +
> +    if (entry && update[0]) {
>  	*prev_key   = update[0]->key;
>  	*prev_value = update[0]->value;
>  	++retcode;

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing

[Emil Velikov]

On 27/02/15 18:07, Jan Vesely wrote:
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> ---
>  xf86drmSL.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/xf86drmSL.c b/xf86drmSL.c
> index acddb54..2160bb8 100644
> --- a/xf86drmSL.c
> +++ b/xf86drmSL.c
> @@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
>      SkipListPtr   list = (SkipListPtr)l;
>      SLEntryPtr    update[SL_MAX_LEVEL + 1];
>      int           retcode = 0;
> +    SLEntryPtr    entry;
> +
> +    entry = SLLocate(list, key, update);
>  
>      *prev_key   = *next_key   = key;
>      *prev_value = *next_value = NULL;
> -	
> -    if (update[0]) {
> +
> +    if (entry && update[0]) {
From a very brief look at git log, the entry check should not be needed.
Must admit that I've not looked at all in the implementation of either
SLLocate or drmSLLookupNeighbors.

That said it seems that none of the three files
(xf86drm{SL,Hash,Random}) has been build as a program for a while. Maybe
we could split it out as a standalone test and let it churn at make
check time ?

Cheers,
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 1654 bytes --]

On Fri, 2015-03-20 at 17:38 +0000, Emil Velikov wrote:
> On 27/02/15 18:07, Jan Vesely wrote:
> > Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> > ---
> >  xf86drmSL.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/xf86drmSL.c b/xf86drmSL.c
> > index acddb54..2160bb8 100644
> > --- a/xf86drmSL.c
> > +++ b/xf86drmSL.c
> > @@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
> >      SkipListPtr   list = (SkipListPtr)l;
> >      SLEntryPtr    update[SL_MAX_LEVEL + 1];
> >      int           retcode = 0;
> > +    SLEntryPtr    entry;
> > +
> > +    entry = SLLocate(list, key, update);
> >  
> >      *prev_key   = *next_key   = key;
> >      *prev_value = *next_value = NULL;
> > -	
> > -    if (update[0]) {
> > +
> > +    if (entry && update[0]) {
> From a very brief look at git log, the entry check should not be needed.
> Must admit that I've not looked at all in the implementation of either
> SLLocate or drmSLLookupNeighbors.

SLLocate might return early and leave the array uninitialized. All other
calls to it check the return value. I guess the warning that the
previous commit tried to fix was "set-but-unused" variable.

> 
> That said it seems that none of the three files
> (xf86drm{SL,Hash,Random}) has been build as a program for a while. Maybe
> we could split it out as a standalone test and let it churn at make
> check time ?

Sounds like a good idea. I'll try to take a look when time permits, but
I'd leave that as a separate patch.

thanks,
jan

> 
> Cheers,
> Emil

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 2001 bytes --]

On Fri, 2015-03-20 at 14:01 -0400, Jan Vesely wrote:
> On Fri, 2015-03-20 at 17:38 +0000, Emil Velikov wrote:
> > On 27/02/15 18:07, Jan Vesely wrote:
> > > Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> > > ---
> > >  xf86drmSL.c | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/xf86drmSL.c b/xf86drmSL.c
> > > index acddb54..2160bb8 100644
> > > --- a/xf86drmSL.c
> > > +++ b/xf86drmSL.c
> > > @@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
> > >      SkipListPtr   list = (SkipListPtr)l;
> > >      SLEntryPtr    update[SL_MAX_LEVEL + 1];
> > >      int           retcode = 0;
> > > +    SLEntryPtr    entry;
> > > +
> > > +    entry = SLLocate(list, key, update);
> > >  
> > >      *prev_key   = *next_key   = key;
> > >      *prev_value = *next_value = NULL;
> > > -	
> > > -    if (update[0]) {
> > > +
> > > +    if (entry && update[0]) {
> > From a very brief look at git log, the entry check should not be needed.
> > Must admit that I've not looked at all in the implementation of either
> > SLLocate or drmSLLookupNeighbors.
> 
> SLLocate might return early and leave the array uninitialized. All other
> calls to it check the return value. I guess the warning that the
> previous commit tried to fix was "set-but-unused" variable.

I take this back. You were right. SLLocate might return NULL in
non-failing case, and we cannot rely on the return value. I'll post an
updated patch (and a move to tests) shortly

jan

> 
> > 
> > That said it seems that none of the three files
> > (xf86drm{SL,Hash,Random}) has been build as a program for a while. Maybe
> > we could split it out as a standalone test and let it churn at make
> > check time ?
> 
> Sounds like a good idea. I'll try to take a look when time permits, but
> I'd leave that as a separate patch.
> 
> thanks,
> jan
> 
> > 
> > Cheers,
> > Emil
> 

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 5/8] Fix aliasing and switch-enum warnings

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/exynos/exynos_fimg2d_test.c | 3 +++
 tests/modeprint/modeprint.c       | 1 +
 xf86drmMode.c                     | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
index dc7c5cb..ba8d12c 100644
--- a/tests/exynos/exynos_fimg2d_test.c
+++ b/tests/exynos/exynos_fimg2d_test.c
@@ -273,6 +273,7 @@ static int g2d_copy_test(struct exynos_device *dev, struct exynos_bo *src,
 		src_img.user_ptr[0].userptr = userptr;
 		src_img.user_ptr[0].size = size;
 		break;
+	case G2D_IMGBUF_COLOR:
 	default:
 		type = G2D_IMGBUF_GEM;
 		break;
@@ -356,6 +357,7 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
 		src_img.user_ptr[0].userptr = userptr;
 		src_img.user_ptr[0].size = size;
 		break;
+	case G2D_IMGBUF_COLOR:
 	default:
 		type = G2D_IMGBUF_GEM;
 		break;
@@ -444,6 +446,7 @@ static int g2d_blend_test(struct exynos_device *dev,
 		src_img.user_ptr[0].userptr = userptr;
 		src_img.user_ptr[0].size = size;
 		break;
+	case G2D_IMGBUF_COLOR:
 	default:
 		type = G2D_IMGBUF_GEM;
 		break;
diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
index de59cbd..508c9f2 100644
--- a/tests/modeprint/modeprint.c
+++ b/tests/modeprint/modeprint.c
@@ -60,6 +60,7 @@ static const char* getConnectionText(drmModeConnection conn)
 		return "connected";
 	case DRM_MODE_DISCONNECTED:
 		return "disconnected";
+	case DRM_MODE_UNKNOWNCONNECTION:
 	default:
 		return "unknown";
 	}
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 61d5e01..acb6c52 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -858,7 +858,7 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx)
 
 	i = 0;
 	while (i < len) {
-		e = (struct drm_event *) &buffer[i];
+		e = (void *) &buffer[i];
 		switch (e->type) {
 		case DRM_EVENT_VBLANK:
 			if (evctx->version < 1 ||
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 5/8] Fix aliasing and switch-enum warnings

[Emil Velikov]

On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> ---
>  tests/exynos/exynos_fimg2d_test.c | 3 +++
>  tests/modeprint/modeprint.c       | 1 +
>  xf86drmMode.c                     | 2 +-
>  3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
> index dc7c5cb..ba8d12c 100644
> --- a/tests/exynos/exynos_fimg2d_test.c
> +++ b/tests/exynos/exynos_fimg2d_test.c
> @@ -273,6 +273,7 @@ static int g2d_copy_test(struct exynos_device *dev, struct exynos_bo *src,
>                 src_img.user_ptr[0].userptr = userptr;
>                 src_img.user_ptr[0].size = size;
>                 break;
> +       case G2D_IMGBUF_COLOR:
>         default:
>                 type = G2D_IMGBUF_GEM;
>                 break;
> @@ -356,6 +357,7 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
>                 src_img.user_ptr[0].userptr = userptr;
>                 src_img.user_ptr[0].size = size;
>                 break;
> +       case G2D_IMGBUF_COLOR:
>         default:
>                 type = G2D_IMGBUF_GEM;
>                 break;
> @@ -444,6 +446,7 @@ static int g2d_blend_test(struct exynos_device *dev,
>                 src_img.user_ptr[0].userptr = userptr;
>                 src_img.user_ptr[0].size = size;
>                 break;
> +       case G2D_IMGBUF_COLOR:
>         default:
>                 type = G2D_IMGBUF_GEM;
>                 break;
Hi Inki, Joonyoung

The above hunks look good imho, although a quick ack from an Exynos
person would be appreciated :-)

Cheers,
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 6/8] dristat: Handle DRM_CONSISTENT

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/dristat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dristat.c b/tests/dristat.c
index 992ceb4..cca4b03 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -100,6 +100,7 @@ static void getvm(int fd)
 	case DRM_SHM:            typename = "SHM"; break;
 	case DRM_AGP:            typename = "AGP"; break;
 	case DRM_SCATTER_GATHER: typename = "SG";  break;
+	case DRM_CONSISTENT:     typename = "CON"; break;
 	default:                 typename = "???"; break;
 	}
 
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 7/8] Fix unused, and unused-but-set variables warnings

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/exynos/exynos_fimg2d_test.c | 4 +---
 xf86drm.c                         | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
index ba8d12c..38ea974 100644
--- a/tests/exynos/exynos_fimg2d_test.c
+++ b/tests/exynos/exynos_fimg2d_test.c
@@ -322,7 +322,7 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
 {
 	struct g2d_context *ctx;
 	struct g2d_image src_img, dst_img;
-	unsigned int src_x, src_y, dst_x, dst_y, img_w, img_h;
+	unsigned int src_x, src_y, img_w, img_h;
 	unsigned long userptr, size;
 	int ret;
 
@@ -336,8 +336,6 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
 
 	src_x = 0;
 	src_y = 0;
-	dst_x = 0;
-	dst_y = 0;
 	img_w = screen_width;
 	img_h = screen_height;
 
diff --git a/xf86drm.c b/xf86drm.c
index 016247f..3c8fc0b 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -308,10 +308,13 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
     char            buf[64];
     int             fd;
     mode_t          devmode = DRM_DEV_MODE, serv_mode;
+    gid_t           serv_group;
+#if !defined(UDEV)
     int             isroot  = !geteuid();
     uid_t           user    = DRM_DEV_UID;
-    gid_t           group   = DRM_DEV_GID, serv_group;
-    
+    gid_t           group   = DRM_DEV_GID;
+#endif
+
     switch (type) {
     case DRM_NODE_PRIMARY:
 	    dev_name = DRM_DEV_NAME;
@@ -333,7 +336,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
 	drm_server_info->get_perms(&serv_group, &serv_mode);
 	devmode  = serv_mode ? serv_mode : DRM_DEV_MODE;
 	devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
-	group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
     }
 
 #if !defined(UDEV)
@@ -354,6 +356,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
     }
 
     if (drm_server_info) {
+	group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
 	chown_check_return(buf, user, group);
 	chmod(buf, devmode);
     }
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 7/8] Fix unused, and unused-but-set variables warnings

[Emil Velikov]

On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> ---
>  tests/exynos/exynos_fimg2d_test.c | 4 +---
>  xf86drm.c                         | 9 ++++++---
>  2 files changed, 7 insertions(+), 6 deletions(-)
>
...
> @@ -333,7 +336,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
>         drm_server_info->get_perms(&serv_group, &serv_mode);
>         devmode  = serv_mode ? serv_mode : DRM_DEV_MODE;
>         devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
> -       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
>      }
>
>  #if !defined(UDEV)
> @@ -354,6 +356,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
>      }
>
>      if (drm_server_info) {
> +       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
I think you can leave this back where it was. It doesn't seem to bring
anything beneficial.

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 7/8] Fix unused, and unused-but-set variables warnings

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 1433 bytes --]

On Fri, 2015-03-13 at 22:56 +0000, Emil Velikov wrote:
> On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> > Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
> > ---
> >  tests/exynos/exynos_fimg2d_test.c | 4 +---
> >  xf86drm.c                         | 9 ++++++---
> >  2 files changed, 7 insertions(+), 6 deletions(-)
> >
> ...
> > @@ -333,7 +336,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
> >         drm_server_info->get_perms(&serv_group, &serv_mode);
> >         devmode  = serv_mode ? serv_mode : DRM_DEV_MODE;
> >         devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
> > -       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
> >      }
> >
> >  #if !defined(UDEV)
> > @@ -354,6 +356,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
> >      }
> >
> >      if (drm_server_info) {
> > +       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
> I think you can leave this back where it was. It doesn't seem to bring
> anything beneficial.

"group" variable is now only available #if !defined(UDEV), so  I can;'t
really move it back without adding a pair of ifdefs,
moving it here looked nicer than adding another set of #if/#endif.

I wanted to move the declaration here as well, but I'm not sure how it'd
play with old/broken compilers that need to be supported.

jan

> 
> -Emil

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 7/8] Fix unused, and unused-but-set variables warnings

[Emil Velikov]

On 13/03/15 23:37, Jan Vesely wrote:
> On Fri, 2015-03-13 at 22:56 +0000, Emil Velikov wrote:
>> On 27 February 2015 at 18:07, Jan Vesely <jan.vesely@rutgers.edu> wrote:
>>> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
>>> ---
>>>  tests/exynos/exynos_fimg2d_test.c | 4 +---
>>>  xf86drm.c                         | 9 ++++++---
>>>  2 files changed, 7 insertions(+), 6 deletions(-)
>>>
>> ...
>>> @@ -333,7 +336,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
>>>         drm_server_info->get_perms(&serv_group, &serv_mode);
>>>         devmode  = serv_mode ? serv_mode : DRM_DEV_MODE;
>>>         devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
>>> -       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
>>>      }
>>>
>>>  #if !defined(UDEV)
>>> @@ -354,6 +356,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
>>>      }
>>>
>>>      if (drm_server_info) {
>>> +       group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
>> I think you can leave this back where it was. It doesn't seem to bring
>> anything beneficial.
> 
> "group" variable is now only available #if !defined(UDEV), so  I can;'t
> really move it back without adding a pair of ifdefs,
> moving it here looked nicer than adding another set of #if/#endif.
> 
> I wanted to move the declaration here as well, but I'm not sure how it'd
> play with old/broken compilers that need to be supported.
> 
Got confused in the #ifdef spaghetti. Comment withdrawn.

Thanks
Emil

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 8/8] Fix unused function warnings

[Jan Vesely]

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/drmstat.c | 9 ++-------
 xf86drm.c       | 8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/drmstat.c b/tests/drmstat.c
index 36cc70d..6502d78 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -82,10 +82,12 @@ static void getversion(int fd)
     }
 }
 
+/*
 static void handler(int fd, void *oldctx, void *newctx)
 {
     printf("Got fd %d\n", fd);
 }
+*/
 
 static void process_sigio(char *device)
 {
@@ -427,11 +429,4 @@ int main(int argc, char **argv)
     return r; 
 }
 
-static void DRM_PRINTFLIKE(4, 0)
-xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
-                va_list args)
-{
-	vfprintf(stderr, format, args);
-}
-
 int xf86ConfigDRI[10];
diff --git a/xf86drm.c b/xf86drm.c
index 3c8fc0b..a660842 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -131,12 +131,6 @@ drmMsg(const char *format, ...)
     }
 }
 
-static void
-drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
-{
-    drm_debug_print = debug_msg_ptr;
-}
-
 static void *drmHashTable = NULL; /* Context switch callbacks */
 
 void *drmGetHashTable(void)
@@ -272,6 +266,7 @@ static int drmMatchBusID(const char *id1, const char *id2, int pci_domain_ok)
  * If any other failure happened then it will output error mesage using
  * drmMsg() call.
  */
+#if !defined(UDEV)
 static int chown_check_return(const char *path, uid_t owner, gid_t group)
 {
 	int rv;
@@ -287,6 +282,7 @@ static int chown_check_return(const char *path, uid_t owner, gid_t group)
 			path, errno, strerror(errno));
 	return -1;
 }
+#endif
 
 /**
  * Open the DRM device, creating it if necessary.
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm v2 8/8] Fix unused function warnings

[Jan Vesely]

v2: Remove the handler function instead of commenting out
    split debugmsg function removal to a separate patch

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 tests/drmstat.c | 13 -------------
 xf86drm.c       |  2 ++
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tests/drmstat.c b/tests/drmstat.c
index c6ff1ff..c800ebb 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -81,11 +81,6 @@ static void getversion(int fd)
 	printf( "No driver available\n" );
     }
 }
-	
-void handler(int fd, void *oldctx, void *newctx)
-{
-    printf("Got fd %d\n", fd);
-}
 
 static void process_sigio(char *device)
 {
@@ -97,7 +92,6 @@ static void process_sigio(char *device)
     }
 
     sigio_fd = fd;
-    /*  drmInstallSIGIOHandler(fd, handler); */
     for (;;) sleep(60);
 }
 
@@ -427,11 +421,4 @@ int main(int argc, char **argv)
     return r; 
 }
 
-void DRM_PRINTFLIKE(4, 0)
-xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
-                va_list args)
-{
-	vfprintf(stderr, format, args);
-}
-
 int xf86ConfigDRI[10];
diff --git a/xf86drm.c b/xf86drm.c
index 5032f35..a309d57 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -277,6 +277,7 @@ static int drmMatchBusID(const char *id1, const char *id2, int pci_domain_ok)
  * If any other failure happened then it will output error mesage using
  * drmMsg() call.
  */
+#if !defined(UDEV)
 static int chown_check_return(const char *path, uid_t owner, gid_t group)
 {
 	int rv;
@@ -292,6 +293,7 @@ static int chown_check_return(const char *path, uid_t owner, gid_t group)
 			path, errno, strerror(errno));
 	return -1;
 }
+#endif
 
 /**
  * Open the DRM device, creating it if necessary.
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm 9/8] Remove drmSetDebugMsgFunction and related infrastructure

[Jan Vesely]

Not used anywhere

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---
 xf86drm.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/xf86drm.c b/xf86drm.c
index a309d57..ab472ea 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -114,11 +114,6 @@ drmDebugPrint(const char *format, va_list ap)
     return vfprintf(stderr, format, ap);
 }
 
-typedef int DRM_PRINTFLIKE(1, 0) (*debug_msg_func_t)(const char *format,
-						     va_list ap);
-
-static debug_msg_func_t drm_debug_print = drmDebugPrint;
-
 void
 drmMsg(const char *format, ...)
 {
@@ -130,18 +125,12 @@ drmMsg(const char *format, ...)
 	if (drm_server_info) {
 	  drm_server_info->debug_print(format,ap);
 	} else {
-	  drm_debug_print(format, ap);
+	  drmDebugPrint(format, ap);
 	}
 	va_end(ap);
     }
 }
 
-void
-drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
-{
-    drm_debug_print = debug_msg_ptr;
-}
-
 static void *drmHashTable = NULL; /* Context switch callbacks */
 
 void *drmGetHashTable(void)
-- 
2.1.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 9/8] Remove drmSetDebugMsgFunction and related infrastructure

[Emil Velikov]

On 18 March 2015 at 18:37, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> Not used anywhere
>
Some information from my digging around:

Function was added with commit 79038751ffe(libdrm: add support for
server side functionality in libdrm).
It's not referenced even once in the history of the following projects
 - xserver
 - plymouth
 - mesa
 - xf86-video-ati
  -xf86-video-freedreno
 - xf86-video-i128
 - xf86-video-i740
 - xf86-video-intel
 - xf86-video-mach64
 - xf86-video-mga
 - xf86-video-nouveau
 - xf86-video-r128
 - xf86-video-tdfx
 - xf86-video-savage
 - xf86-video-sis
 - xf86-video-via

So I'm pretty confident that we're safe to nuke it. The above ddx list
should consist of all the drivers/hardware that was ever officially
supported by drm - from dri1 era until now.

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

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 9/8] Remove drmSetDebugMsgFunction and related infrastructure

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 1163 bytes --]

On Fri, 2015-03-20 at 21:06 +0000, Emil Velikov wrote:
> On 18 March 2015 at 18:37, Jan Vesely <jan.vesely@rutgers.edu> wrote:
> > Not used anywhere
> >
> Some information from my digging around:
> 
> Function was added with commit 79038751ffe(libdrm: add support for
> server side functionality in libdrm).
> It's not referenced even once in the history of the following projects
>  - xserver
>  - plymouth
>  - mesa
>  - xf86-video-ati
>   -xf86-video-freedreno
>  - xf86-video-i128
>  - xf86-video-i740
>  - xf86-video-intel
>  - xf86-video-mach64
>  - xf86-video-mga
>  - xf86-video-nouveau
>  - xf86-video-r128
>  - xf86-video-tdfx
>  - xf86-video-savage
>  - xf86-video-sis
>  - xf86-video-via
> 
> So I'm pretty confident that we're safe to nuke it. The above ddx list
> should consist of all the drivers/hardware that was ever officially
> supported by drm - from dri1 era until now.
> 
> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

thanks for checking those. I still don;t have a clear idea which
projects actually use libdrm (other than mesa)

jan

> 
> -Emil

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm v2 8/8] Fix unused function warnings

[Emil Velikov]

On 18/03/15 18:37, Jan Vesely wrote:
> v2: Remove the handler function instead of commenting out
>     split debugmsg function removal to a separate patch
> 
> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Looks good thanks for the split.

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

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 0/8] Warnings fixes

[Emil Velikov]

On 27/02/15 18:07, Jan Vesely wrote:
> His series fixes most of the warnings my compiler spits out running
> make distcheck.
> Most of the changes do not change behaviour and those the do are in separate
> patches.
Nicely done Jan. If you don't mind I would prefer if Theirry's series
lands first as it will clash with some of the patches in tests.

Thanks
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 0/8] Warnings fixes

[Emil Velikov]

Hi Jan,

On 27 February 2015 at 22:27, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> On 27/02/15 18:07, Jan Vesely wrote:
>> His series fixes most of the warnings my compiler spits out running
>> make distcheck.
>> Most of the changes do not change behaviour and those the do are in separate
>> patches.
> Nicely done Jan. If you don't mind I would prefer if Theirry's series
> lands first as it will clash with some of the patches in tests.
>
Seems that Thierry's quite busy so I've went ahead and sent over a few
comments. I'm not planning to look at the patch #4, but the rest look
great. With the comments addressed feel free to add

Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>

Thierry, just realised that I've made a mistake writing your name last
time. Sincerest of apologies, it was not intentional.

Cheers,
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm 0/8] Warnings fixes

[Jan Vesely]

[-- Attachment #1.1: Type: text/plain, Size: 1146 bytes --]

On Fri, 2015-03-13 at 23:20 +0000, Emil Velikov wrote:
> Hi Jan,
> 
> On 27 February 2015 at 22:27, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> > On 27/02/15 18:07, Jan Vesely wrote:
> >> His series fixes most of the warnings my compiler spits out running
> >> make distcheck.
> >> Most of the changes do not change behaviour and those the do are in separate
> >> patches.
> > Nicely done Jan. If you don't mind I would prefer if Theirry's series
> > lands first as it will clash with some of the patches in tests.
> >
> Seems that Thierry's quite busy so I've went ahead and sent over a few
> comments. I'm not planning to look at the patch #4, but the rest look
> great. With the comments addressed feel free to add
> 
> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>

Thank you for finding time to review these. I'll start pushing the
reviewed ones tomorrow, and send v2 of the 3 you commented on.


jan


> 
> Thierry, just realised that I've made a mistake writing your name last
> time. Sincerest of apologies, it was not intentional.
> 
> Cheers,
> Emil

-- 
Jan Vesely <jan.vesely@rutgers.edu>

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel