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); }