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

Revert "libdrm: speed up connector & mode fetching"

Browse source 
This reverts commit cd5c66c659.  It broke too
many kernel assumptions about the double ioctl (connector status, mode
fetching, etc.)
This commit is contained in:
Jesse Barnes 2009-04-10 15:24:10 -07:00
parent fef29358bb
commit 3637dcc66d
1 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libdrm/xf86drmMode.c
View file

@ -357,45 +357,21 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
{
struct drm_mode_get_connector conn;
drmModeConnectorPtr r = NULL;
int pre_props = 8, pre_modes = 16, pre_encoders = 4;
conn.connector_id = connector_id;
conn.connector_type_id = 0;
conn.connector_type = 0;
conn.count_modes = pre_modes;
conn.count_props = pre_props;
conn.count_encoders = pre_encoders;
/*
* Pre-allocate space for some modes, properties, and encoders. If
* we're lucky we won't need to call into the kernel twice.
*/
conn.props_ptr = VOID2U64(drmMalloc(pre_props * sizeof(uint32_t)));
conn.prop_values_ptr = VOID2U64(drmMalloc(pre_props *
sizeof(uint64_t)));
conn.modes_ptr = VOID2U64(drmMalloc(pre_modes *
sizeof(struct drm_mode_modeinfo)));
conn.encoders_ptr = VOID2U64(drmMalloc(pre_encoders *
sizeof(uint32_t)));
conn.count_modes = 0;
conn.modes_ptr = 0;
conn.count_props = 0;
conn.props_ptr = 0;
conn.prop_values_ptr = 0;
conn.count_encoders = 0;
conn.encoders_ptr = 0;
if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
return 0;
if (conn.count_props <= pre_props &&
conn.count_modes <= pre_modes &&
conn.count_encoders <= pre_encoders)
goto done;
/* Oh well, free & reallocate everything and ask again... */
drmFree(U642VOID(conn.prop_values_ptr));
drmFree(U642VOID(conn.props_ptr));
drmFree(U642VOID(conn.modes_ptr));
drmFree(U642VOID(conn.encoders_ptr));
conn.prop_values_ptr = 0;
conn.props_ptr = 0;
conn.modes_ptr = 0;
conn.encoders_ptr = 0;
if (conn.count_props) {
conn.props_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint32_t)));
conn.prop_values_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint64_t)));
@ -410,7 +386,6 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
goto err_allocs;
done:
if(!(r = drmMalloc(sizeof(*r)))) {
goto err_allocs;
}