norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uterm: enable DRM helpers with UTERM_VIDEO_DUMB

Browse Source 
The DRM helpers can actually also be used with dumb-displays so provide it
in both cases.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-28 14:22:19 +01:00
parent 16cf16c1aa
commit b1c7902eeb
2 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/uterm_video.h
View File

@ -418,12 +418,53 @@ static inline int video_do_use(struct uterm_video *video)
return VIDEO_CALL(video->ops->use, -EOPNOTSUPP, video);
}
#ifdef BUILD_ENABLE_VIDEO_DRM
#if defined(BUILD_ENABLE_VIDEO_DRM) || defined(BUILD_ENABLE_VIDEO_DUMB)
char *video_drm_get_id(int fd);
void video_drm_free_id(char *id);
char *video_drm_get_name(int fd);
void video_drm_free_name(char *name);
static inline char *video_drm_get_id(int fd)
{
if (fd < 0)
return NULL;
return drmGetBusid(fd);
}
static inline void video_drm_free_id(char *id)
{
if (!id)
return;
drmFreeBusid(id);
}
static inline char *video_drm_get_name(int fd)
{
drmVersionPtr v;
char *name;
if (fd < 0)
return NULL;
v = drmGetVersion(fd);
if (!v)
return NULL;
name = malloc(v->name_len + 1);
if (name) {
memcpy(name, v->name, v->name_len);
name[v->name_len] = 0;
}
drmFreeVersion(v);
return name;
}
static inline void video_drm_free_name(char *name)
{
if (!name)
return;
free(name);
}
#else

46
src/uterm_video_drm.c
View File

@ -1251,52 +1251,6 @@ static int video_wake_up(struct uterm_video *video)
return 0;
}
char *video_drm_get_id(int fd)
{
if (fd < 0)
return NULL;
return drmGetBusid(fd);
}
void video_drm_free_id(char *id)
{
if (!id)
return;
drmFreeBusid(id);
}
char *video_drm_get_name(int fd)
{
drmVersionPtr v;
char *name;
if (fd < 0)
return NULL;
v = drmGetVersion(fd);
if (!v)
return NULL;
name = malloc(v->name_len + 1);
if (name) {
memcpy(name, v->name, v->name_len);
name[v->name_len] = 0;
}
drmFreeVersion(v);
return name;
}
void video_drm_free_name(char *name)
{
if (!name)
return;
free(name);
}
const struct mode_ops drm_mode_ops = {
.init = NULL,
.destroy = NULL,