KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: remove unused drm_driver_descriptor::driver_name 

Likely unused since day 1, although I've only checked back until the
st/dri unification with commit 29ca7d2c94 ("st/dri: merge dri/drm and
dri/sw backends")

Based on the comment, referencing drmOpenByName it's not something we
want to bring back.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Emil Velikov 2016-10-11 19:39:24 +01:00 committed by Emil Velikov
parent 0f031dcf11
commit 9837cf13b1
10 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
View File

@ -90,7 +90,6 @@ configuration_query(enum drm_conf conf)
static const struct drm_driver_descriptor driver_descriptors[] = {
{
.name = "i915",
.driver_name = "i915",
.create_screen = pipe_i915_create_screen,
.configuration = configuration_query,
},
@ -101,68 +100,57 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
*/
{
.name = "i965",
.driver_name = "vc4",
.create_screen = pipe_vc4_create_screen,
.configuration = configuration_query,
},
#endif
{
.name = "i965",
.driver_name = "i915",
.create_screen = pipe_ilo_create_screen,
.configuration = configuration_query,
},
{
.name = "nouveau",
.driver_name = "nouveau",
.create_screen = pipe_nouveau_create_screen,
.configuration = configuration_query,
},
{
.name = "r300",
.driver_name = "radeon",
.create_screen = pipe_r300_create_screen,
.configuration = configuration_query,
},
{
.name = "r600",
.driver_name = "radeon",
.create_screen = pipe_r600_create_screen,
.configuration = configuration_query,
},
{
.name = "radeonsi",
.driver_name = "radeon",
.create_screen = pipe_radeonsi_create_screen,
.configuration = configuration_query,
},
{
.name = "vmwgfx",
.driver_name = "vmwgfx",
.create_screen = pipe_vmwgfx_create_screen,
.configuration = configuration_query,
},
{
.name = "kgsl",
.driver_name = "freedreno",
.create_screen = pipe_freedreno_create_screen,
.configuration = configuration_query,
},
{
.name = "msm",
.driver_name = "freedreno",
.create_screen = pipe_freedreno_create_screen,
.configuration = configuration_query,
},
{
.name = "virtio_gpu",
.driver_name = "virtio-gpu",
.create_screen = pipe_virgl_create_screen,
.configuration = configuration_query,
},
{
.name = "vc4",
.driver_name = "vc4",
.create_screen = pipe_vc4_create_screen,
.configuration = configuration_query,
},

9
src/gallium/include/state_tracker/drm_driver.h
View File

@ -90,11 +90,6 @@ struct drm_driver_descriptor
*/
const char *name;
/**
* Kernel driver name, as accepted by drmOpenByName.
*/
const char *driver_name;
/**
* Create a pipe srcreen.
*
@ -103,7 +98,6 @@ struct drm_driver_descriptor
*/
struct pipe_screen* (*create_screen)(int drm_fd);
/**
* Return a configuration value.
*
@ -119,10 +113,9 @@ extern struct drm_driver_descriptor driver_descriptor;
/**
* Instantiate a drm_driver_descriptor struct.
*/
#define DRM_DRIVER_DESCRIPTOR(name_str, driver_name_str, func, conf) \
#define DRM_DRIVER_DESCRIPTOR(name_str, func, conf) \
struct drm_driver_descriptor driver_descriptor = { \
.name = name_str, \
.driver_name = driver_name_str, \
.create_screen = func, \
.configuration = (conf), \
};

2
src/gallium/targets/pipe-loader/pipe_i915.c
View File

@ -47,4 +47,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("i915", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_i965.c
View File

@ -44,4 +44,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
return NULL;
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("i965", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_msm.c
View File

@ -41,4 +41,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("msm", "freedreno", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("msm", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_nouveau.c
View File

@ -41,4 +41,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("nouveau", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_r300.c
View File

@ -37,4 +37,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("r300", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_r600.c
View File

@ -37,4 +37,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("r600", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_radeonsi.c
View File

@ -43,4 +43,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("radeonsi", create_screen, drm_configuration)

2
src/gallium/targets/pipe-loader/pipe_vmwgfx.c
View File

@ -47,4 +47,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("vmwgfx", "vmwgfx", create_screen, drm_configuration)
DRM_DRIVER_DESCRIPTOR("vmwgfx", create_screen, drm_configuration)