fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-06 04:48:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor test fixes

Browse source
This commit is contained in:
Alan Hourihane 2008-02-20 19:54:36 +00:00
parent 66cd6bd666
commit 88cb873045
3 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
tests/modedemo/demo.c
View file

@ -16,6 +16,12 @@
#include <stdint.h>
#include <unistd.h>
#include <string.h>
#ifdef CLEAN_FBDEV
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/fb.h>
#endif
#include "xf86drm.h"
#include "xf86drmMode.h"
@ -26,6 +32,11 @@ void testCursor(int fd, uint32_t crtc);
void prettyColors(int fd, unsigned int handle);
void prettyCursor(int fd, unsigned int handle, unsigned int color);
#ifdef CLEAN_FBDEV
struct fb_var_screeninfo var;
struct fb_fix_screeninfo fix;
#endif
/* structs for the demo_driver */
struct demo_driver;
@ -101,6 +112,20 @@ int main(int argc, char **argv)
int num;
int i;
#ifdef CLEAN_FBDEV
int fbdev_fd;
fbdev_fd = open("/dev/fb0", O_RDWR);
memset(&var, 0, sizeof(struct fb_var_screeninfo));
memset(&fix, 0, sizeof(struct fb_fix_screeninfo));
if (ioctl(fbdev_fd, FBIOGET_VSCREENINFO, &var))
printf("var %s\n", strerror(errno));
if (ioctl(fbdev_fd, FBIOGET_FSCREENINFO, &fix))
printf("fix %s\n", strerror(errno));
#endif
printf("starting demo\n");
driver = demoCreateDriver();
@ -155,10 +180,12 @@ int main(int argc, char **argv)
#ifdef CLEAN_FBDEV
if (ioctl(fbdev_fd, FBIOPUT_VSCREENINFO, &var))
printf("var %s\n", strerror(errno));
close(fbdev_fd);
#endif
printf("ok\n");
return 0;
printf("ok\n");
return 0;
}
int demoCreateScreens(struct demo_driver *driver)
@ -296,8 +323,20 @@ void demoTakeDownScreen(struct demo_screen *screen)
int i;
drmBO bo;
#if 0
/* This can bust the fbdev arrangement as it basically unhooks
* the outputs and the fbdev backend doesn't know how to put things
* back on track. Realistically, it's up to the crtc owner to restore
* things.....
*
* So if you are mixing API's make sure the modesetting owner puts
* back the original CRTC arrangement so fbdev can continue...
*
* Ho-hum..
*/
if (screen->crtc)
drmModeSetCrtc(fd, screen->crtc->crtc_id, 0, 0, 0, 0, 0, 0);
#endif
if (screen->fb)
drmModeRmFB(fd, screen->fb->buffer_id);
@ -354,7 +393,7 @@ struct demo_driver* demoCreateDriver(void)
memset(driver, 0, sizeof(struct demo_driver));
driver->fd = drmOpenControl(0);
driver->fd = drmOpen("i915",NULL);
if (driver->fd < 0) {
printf("Failed to open the card fb\n");

14
tests/modefb/demo.c
View file

@ -26,7 +26,12 @@ int main(int argc, char **argv)
char name[100];
int i,d;
int fd;
int drmfd = drmOpenControl(0);
int drmfd = drmOpen("i915", NULL);
if (drmfd < 0) {
printf("drmOpenControl failed\n");
return 1;
}
/* try four devices */
for (d = 0; d < 4; d++) {
@ -38,11 +43,6 @@ int main(int argc, char **argv)
return 1;
}
if (drmfd < 0) {
printf("drmOpenControl failed\n");
return 1;
}
memset(&var, 0, sizeof(struct fb_var_screeninfo));
memset(&fix, 0, sizeof(struct fb_fix_screeninfo));
@ -79,6 +79,8 @@ int main(int argc, char **argv)
printf("cursor (may show up on wrong CRTC - fixme)\n");
cursor(fd, drmfd);
close(fd);
}
return 0;
}

2
tests/modehotplug/demo.c
View file

@ -123,7 +123,7 @@ struct demo_driver* demoCreateDriver(void)
memset(driver, 0, sizeof(struct demo_driver));
driver->fd = drmOpenControl(0);
driver->fd = drmOpen("i915", NULL);
if (driver->fd < 0) {
printf("Failed to open the card fb\n");