tests/{kms_cursor_legacy, drv_missed_irq}, lib/drmtest: Fix warnings about unused function return values.
PATCH 1/2 tests/{kms_cursor_legacy, drv_missed_irq}, lib/drmtest: Fix warnings about unused function return values.
--- lib/drmtest.c | 8 +++----- tests/drv_missed_irq.c | 2 +- tests/kms_cursor_legacy.c | 8 ++++++-- 3 files changed, 10 insertions(+), 8 deletions(-)
lib/drmtest.c +3 -5
@@ -218,11 +218,11 @@ int drm_get_card(void)return -1 ; } -static void modprobe (const char *driver) +static int modprobe (const char *driver) {char buf[128 ];snprintf (buf,sizeof (buf),"/sbin/modprobe -s %s" , driver); -system (buf); +return system (buf); }/**
@@ -236,8 +236,6 @@ static void modprobe(const char *driver)*/ int __drm_open_driver (int chipset) { -if (chipset &DRIVER_VGEM ) -modprobe ("vgem" );for (int i =0 ; i <16 ; i++) {char name[80 ];
@@ -258,7 +256,7 @@ int __drm_open_driver(int chipset)if (chipset &DRIVER_VGEM &&is_vgem_device (fd)) -return fd; +return (modprobe ("vgem" ) ==-1 ) ?-1 : fd;close (fd); }
tests/drv_missed_irq.c +1 -1
@@ -130,7 +130,7 @@ igt_simple_mainfclose (file); file =igt_debugfs_fopen ("i915_ring_test_irq" ,"r" ); -fscanf (file,"%x" , &expect_rings); +igt_assert_eq (fscanf (file,"%x" , &expect_rings),1 );fclose (file);igt_debug ("Testing rings %x\n" , expect_rings);
tests/kms_cursor_legacy.c +6 -2
@@ -238,6 +238,7 @@ static void flip(struct data *data, } igt_fork(child, 1) {unsigned long count =0 ; +ssize_t nread;unsigned crtc = data->resources->crtcs[flip_pipe];igt_until_timeout (timeout) {
@@ -245,7 +246,8 @@ static void flip(struct data *data,drmModePageFlip (data->fd, crtc, fb_id,DRM_MODE_PAGE_FLIP_EVENT ,NULL ); -read (data->fd, buf,sizeof (buf)); + nread =read (data->fd, buf,sizeof (buf)); +igt_assert_eq (nread,sizeof (buf)); count++; }
@@ -286,6 +288,7 @@ static void basic_flip(struct data *data)struct igt_fb fb_info;unsigned vblank_start;int target; +ssize_t nread;struct drm_event buf;uint32_t fb_id;
@@ -338,7 +341,8 @@ static void basic_flip(struct data *data)igt_assert_eq (get_vblank (data->fd,0 ,0 ), vblank_start);igt_set_timeout (1 ,"Stuck page flip" ); -read (data->fd, &buf,sizeof (buf)); + nread =read (data->fd, &buf,sizeof (buf)); +igt_assert_eq (nread,sizeof (buf));igt_assert_eq (get_vblank (data->fd,0 ,0 ), vblank_start +1 );igt_reset_timeout ();
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 lib/drmtest: Report proper err message when opening the driver.
--- lib/drmtest.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
lib/drmtest.c +11 -1
@@ -261,7 +261,17 @@ int __drm_open_driver(int chipset)close (fd); } -igt_skip ("No intel gpu found\n" ); +switch (chipset & (DRIVER_INTEL |DRIVER_VC4 |DRIVER_VGEM )) { +case DRIVER_INTEL : +igt_skip ("No intel gpu found\n" ); +break ; +case DRIVER_VC4 : +igt_skip ("No vc4 gpu found\n" ); +break ; +case DRIVER_VGEM : +igt_skip ("No vgem support found\n" ); +break ; + }return -1 ; }
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/2] lib/drmtest: Report proper err message when opening the driver.
Quoted 15 lines · Marius Vlad
Signed-off-by Marius Vlad <[email protected]>CC Chris Wilson <[email protected]>--- lib/drmtest.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)lib/drmtest.c +0
-1@@ -261,7 +261,17 @@ int __drm_open_driver(int chipset)close (fd); } -igt_skip ("No intel gpu found\n" );
lib/drmtest.c int __drm_open_driver(int chipset) · line 273
Quoted 10 lines
lib/drmtest.c +10
-0+switch (chipset & (DRIVER_INTEL |DRIVER_VC4 |DRIVER_VGEM )) { +case DRIVER_INTEL : +igt_skip ("No intel gpu found\n" ); +break ; +case DRIVER_VC4 : +igt_skip ("No vc4 gpu found\n" ); +break ; +case DRIVER_VGEM : +igt_skip ("No vgem support found\n" ); +break ;
That is just as silly as the first error message.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Marius Vlad
Signed-off-by Marius Vlad <[email protected]>CC Chris Wilson <[email protected]>--- lib/drmtest.c | 8 +++----- tests/drv_missed_irq.c | 2 +- tests/kms_cursor_legacy.c | 8 ++++++-- 3 files changed, 10 insertions(+), 8 deletions(-)lib/drmtest.c +2
-2@@ -218,11 +218,11 @@ int drm_get_card(void)return -1 ; } -static void modprobe (const char *driver) +static int modprobe (const char *driver) {char buf[128 ];snprintf (buf,sizeof (buf),"/sbin/modprobe -s %s" , driver); -system (buf); +return system (buf); }/**
lib/drmtest.c static void modprobe(const char *driver) · line 240
Quoted 5 lines
lib/drmtest.c +0
-2@@ -236,8 +236,6 @@ static void modprobe(const char *driver)*/ int __drm_open_driver (int chipset) { -if (chipset &DRIVER_VGEM ) -modprobe ("vgem" );
If you don't modprobe it first...
lib/drmtest.c int __drm_open_driver(int chipset) · line 259
Quoted 8 lines
lib/drmtest.c +1
-1for (int i =0 ; i <16 ; i++) {char name[80 ];@@ -258,7 +256,7 @@ int __drm_open_driver(int chipset)if (chipset &DRIVER_VGEM &&is_vgem_device (fd)) -return fd; +return (modprobe ("vgem" ) ==-1 ) ?-1 : fd;
it won't be available as /dev/dri/cardN.
As I noted, we do *NOT* care about the return value of the system call.
tests/drv_missed_irq.c igt_simple_main · line 133
Quoted 12 lines
lib/drmtest.c +0
-0close (fd); }tests/drv_missed_irq.c +1
-1@@ -130,7 +130,7 @@ igt_simple_mainfclose (file); file =igt_debugfs_fopen ("i915_ring_test_irq" ,"r" ); -fscanf (file,"%x" , &expect_rings); +igt_assert_eq (fscanf (file,"%x" , &expect_rings),1 );
NO.
Quoted 16 lines
tests/drv_missed_irq.c +0
-0fclose (file);igt_debug ("Testing rings %x\n" , expect_rings);tests/kms_cursor_legacy.c +1
-0@@ -238,6 +238,7 @@ static void flip(struct data *data, } igt_fork(child, 1) {unsigned long count =0 ; +ssize_t nread;unsigned crtc = data->resources->crtcs[flip_pipe];igt_until_timeout (timeout) {
tests/kms_cursor_legacy.c static void flip(struct data *data, · line 250
Quoted 6 lines
tests/kms_cursor_legacy.c +2
-1@@ -245,7 +246,8 @@ static void flip(struct data *data,drmModePageFlip (data->fd, crtc, fb_id,DRM_MODE_PAGE_FLIP_EVENT ,NULL ); -read (data->fd, buf,sizeof (buf)); + nread =read (data->fd, buf,sizeof (buf)); +igt_assert_eq (nread,sizeof (buf));
NO.
Quoted 12 lines
tests/kms_cursor_legacy.c +1
-0count++; }@@ -286,6 +288,7 @@ static void basic_flip(struct data *data)struct igt_fb fb_info;unsigned vblank_start;int target; +ssize_t nread;struct drm_event buf;uint32_t fb_id;
tests/kms_cursor_legacy.c static void basic_flip(struct data *data) · line 344
Quoted 5 lines
tests/kms_cursor_legacy.c +1
-1@@ -338,7 +341,8 @@ static void basic_flip(struct data *data)igt_assert_eq (get_vblank (data->fd,0 ,0 ), vblank_start);igt_set_timeout (1 ,"Stuck page flip" ); -read (data->fd, &buf,sizeof (buf)); + nread =read (data->fd, &buf,sizeof (buf));
NO, NO, NO.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx