tests: Move name tables to libutil
These tables are duplicated in several places, so move them into libutil so that they can be shared. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>main
Thierry Reding
Emil Velikov
parent
1ec3c44bdd
commit
4664d657ea
|
|
@ -62,6 +62,7 @@
|
|||
|
||||
#include "util/common.h"
|
||||
#include "util/format.h"
|
||||
#include "util/kms.h"
|
||||
#include "util/pattern.h"
|
||||
|
||||
#include "buffers.h"
|
||||
|
|
@ -126,64 +127,6 @@ static inline int64_t U642I64(uint64_t val)
|
|||
return (int64_t)*((int64_t *)&val);
|
||||
}
|
||||
|
||||
struct type_name {
|
||||
int type;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
#define type_name_fn(res) \
|
||||
const char * res##_str(int type) { \
|
||||
unsigned int i; \
|
||||
for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
|
||||
if (res##_names[i].type == type) \
|
||||
return res##_names[i].name; \
|
||||
} \
|
||||
return "(invalid)"; \
|
||||
}
|
||||
|
||||
struct type_name encoder_type_names[] = {
|
||||
{ DRM_MODE_ENCODER_NONE, "none" },
|
||||
{ DRM_MODE_ENCODER_DAC, "DAC" },
|
||||
{ DRM_MODE_ENCODER_TMDS, "TMDS" },
|
||||
{ DRM_MODE_ENCODER_LVDS, "LVDS" },
|
||||
{ DRM_MODE_ENCODER_TVDAC, "TVDAC" },
|
||||
{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
|
||||
{ DRM_MODE_ENCODER_DSI, "DSI" },
|
||||
{ DRM_MODE_ENCODER_DPMST, "DPMST" },
|
||||
};
|
||||
|
||||
static type_name_fn(encoder_type)
|
||||
|
||||
struct type_name connector_status_names[] = {
|
||||
{ DRM_MODE_CONNECTED, "connected" },
|
||||
{ DRM_MODE_DISCONNECTED, "disconnected" },
|
||||
{ DRM_MODE_UNKNOWNCONNECTION, "unknown" },
|
||||
};
|
||||
|
||||
static type_name_fn(connector_status)
|
||||
|
||||
struct type_name connector_type_names[] = {
|
||||
{ DRM_MODE_CONNECTOR_Unknown, "unknown" },
|
||||
{ DRM_MODE_CONNECTOR_VGA, "VGA" },
|
||||
{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
|
||||
{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
|
||||
{ DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
|
||||
{ DRM_MODE_CONNECTOR_Composite, "composite" },
|
||||
{ DRM_MODE_CONNECTOR_SVIDEO, "s-video" },
|
||||
{ DRM_MODE_CONNECTOR_LVDS, "LVDS" },
|
||||
{ DRM_MODE_CONNECTOR_Component, "component" },
|
||||
{ DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN" },
|
||||
{ DRM_MODE_CONNECTOR_DisplayPort, "DP" },
|
||||
{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
|
||||
{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
|
||||
{ DRM_MODE_CONNECTOR_TV, "TV" },
|
||||
{ DRM_MODE_CONNECTOR_eDP, "eDP" },
|
||||
{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
|
||||
{ DRM_MODE_CONNECTOR_DSI, "DSI" },
|
||||
};
|
||||
|
||||
static type_name_fn(connector_type)
|
||||
|
||||
#define bit_name_fn(res) \
|
||||
const char * res##_str(int type) { \
|
||||
unsigned int i; \
|
||||
|
|
@ -243,7 +186,7 @@ static void dump_encoders(struct device *dev)
|
|||
printf("%d\t%d\t%s\t0x%08x\t0x%08x\n",
|
||||
encoder->encoder_id,
|
||||
encoder->crtc_id,
|
||||
encoder_type_str(encoder->encoder_type),
|
||||
util_lookup_encoder_type_name(encoder->encoder_type),
|
||||
encoder->possible_crtcs,
|
||||
encoder->possible_clones);
|
||||
}
|
||||
|
|
@ -387,7 +330,7 @@ static void dump_connectors(struct device *dev)
|
|||
printf("%d\t%d\t%s\t%-15s\t%dx%d\t\t%d\t",
|
||||
connector->connector_id,
|
||||
connector->encoder_id,
|
||||
connector_status_str(connector->connection),
|
||||
util_lookup_connector_status_name(connector->connection),
|
||||
_connector->name,
|
||||
connector->mmWidth, connector->mmHeight,
|
||||
connector->count_modes);
|
||||
|
|
@ -611,10 +554,11 @@ static struct resources *get_resources(struct device *dev)
|
|||
/* Set the name of all connectors based on the type name and the per-type ID. */
|
||||
for (i = 0; i < res->res->count_connectors; i++) {
|
||||
struct connector *connector = &res->connectors[i];
|
||||
drmModeConnector *conn = connector->connector;
|
||||
|
||||
asprintf(&connector->name, "%s-%u",
|
||||
connector_type_str(connector->connector->connector_type),
|
||||
connector->connector->connector_type_id);
|
||||
util_lookup_connector_type_name(conn->connector_type),
|
||||
conn->connector_type_id);
|
||||
}
|
||||
|
||||
#define get_properties(_res, __res, type, Type) \
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#include "xf86drmMode.h"
|
||||
|
||||
#include "util/common.h"
|
||||
#include "util/kms.h"
|
||||
|
||||
static inline int64_t U642I64(uint64_t val)
|
||||
{
|
||||
|
|
@ -45,44 +46,6 @@ static inline int64_t U642I64(uint64_t val)
|
|||
int fd;
|
||||
drmModeResPtr res = NULL;
|
||||
|
||||
static const char *connector_type_str(uint32_t type)
|
||||
{
|
||||
switch (type) {
|
||||
case DRM_MODE_CONNECTOR_Unknown:
|
||||
return "Unknown";
|
||||
case DRM_MODE_CONNECTOR_VGA:
|
||||
return "VGA";
|
||||
case DRM_MODE_CONNECTOR_DVII:
|
||||
return "DVI-I";
|
||||
case DRM_MODE_CONNECTOR_DVID:
|
||||
return "DVI-D";
|
||||
case DRM_MODE_CONNECTOR_DVIA:
|
||||
return "DVI-A";
|
||||
case DRM_MODE_CONNECTOR_Composite:
|
||||
return "Composite";
|
||||
case DRM_MODE_CONNECTOR_SVIDEO:
|
||||
return "SVIDEO";
|
||||
case DRM_MODE_CONNECTOR_LVDS:
|
||||
return "LVDS";
|
||||
case DRM_MODE_CONNECTOR_Component:
|
||||
return "Component";
|
||||
case DRM_MODE_CONNECTOR_9PinDIN:
|
||||
return "9PinDin";
|
||||
case DRM_MODE_CONNECTOR_DisplayPort:
|
||||
return "DisplayPort";
|
||||
case DRM_MODE_CONNECTOR_HDMIA:
|
||||
return "HDMI-A";
|
||||
case DRM_MODE_CONNECTOR_HDMIB:
|
||||
return "HDMI-B";
|
||||
case DRM_MODE_CONNECTOR_TV:
|
||||
return "TV";
|
||||
case DRM_MODE_CONNECTOR_eDP:
|
||||
return "eDP";
|
||||
default:
|
||||
return "Invalid";
|
||||
}
|
||||
}
|
||||
|
||||
/* dump_blob and dump_prop shamelessly copied from ../modetest/modetest.c */
|
||||
static void
|
||||
dump_blob(uint32_t blob_id)
|
||||
|
|
@ -226,7 +189,7 @@ static void listConnectorProperties(void)
|
|||
}
|
||||
|
||||
printf("Connector %u (%s-%u)\n", c->connector_id,
|
||||
connector_type_str(c->connector_type),
|
||||
util_lookup_connector_type_name(c->connector_type),
|
||||
c->connector_type_id);
|
||||
|
||||
listObjectProperties(c->connector_id,
|
||||
|
|
|
|||
|
|
@ -2,5 +2,7 @@ UTIL_FILES := \
|
|||
common.h \
|
||||
format.c \
|
||||
format.h \
|
||||
kms.c \
|
||||
kms.h \
|
||||
pattern.c \
|
||||
pattern.h
|
||||
|
|
|
|||
|
|
@ -0,0 +1,122 @@
|
|||
/*
|
||||
* Copyright 2008 Tungsten Graphics
|
||||
* Jakob Bornecrantz <jakob@tungstengraphics.com>
|
||||
* Copyright 2008 Intel Corporation
|
||||
* Jesse Barnes <jesse.barnes@intel.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* This fairly simple test program dumps output in a similar format to the
|
||||
* "xrandr" tool everyone knows & loves. It's necessarily slightly different
|
||||
* since the kernel separates outputs into encoder and connector structures,
|
||||
* each with their own unique ID. The program also allows test testing of the
|
||||
* memory management and mode setting APIs by allowing the user to specify a
|
||||
* connector and mode to use for mode setting. If all works as expected, a
|
||||
* blue background should be painted on the monitor attached to the specified
|
||||
* connector after the selected mode is set.
|
||||
*
|
||||
* TODO: use cairo to write the mode info on the selected output once
|
||||
* the mode has been programmed, along with possible test patterns.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "xf86drmMode.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
struct type_name {
|
||||
unsigned int type;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
static const char *util_lookup_type_name(unsigned int type,
|
||||
const struct type_name *table,
|
||||
unsigned int count)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
if (table[i].type == type)
|
||||
return table[i].name;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const struct type_name encoder_type_names[] = {
|
||||
{ DRM_MODE_ENCODER_NONE, "none" },
|
||||
{ DRM_MODE_ENCODER_DAC, "DAC" },
|
||||
{ DRM_MODE_ENCODER_TMDS, "TMDS" },
|
||||
{ DRM_MODE_ENCODER_LVDS, "LVDS" },
|
||||
{ DRM_MODE_ENCODER_TVDAC, "TVDAC" },
|
||||
{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
|
||||
{ DRM_MODE_ENCODER_DSI, "DSI" },
|
||||
{ DRM_MODE_ENCODER_DPMST, "DPMST" },
|
||||
};
|
||||
|
||||
const char *util_lookup_encoder_type_name(unsigned int type)
|
||||
{
|
||||
return util_lookup_type_name(type, encoder_type_names,
|
||||
ARRAY_SIZE(encoder_type_names));
|
||||
}
|
||||
|
||||
static const struct type_name connector_status_names[] = {
|
||||
{ DRM_MODE_CONNECTED, "connected" },
|
||||
{ DRM_MODE_DISCONNECTED, "disconnected" },
|
||||
{ DRM_MODE_UNKNOWNCONNECTION, "unknown" },
|
||||
};
|
||||
|
||||
const char *util_lookup_connector_status_name(unsigned int status)
|
||||
{
|
||||
return util_lookup_type_name(status, connector_status_names,
|
||||
ARRAY_SIZE(connector_status_names));
|
||||
}
|
||||
|
||||
static const struct type_name connector_type_names[] = {
|
||||
{ DRM_MODE_CONNECTOR_Unknown, "unknown" },
|
||||
{ DRM_MODE_CONNECTOR_VGA, "VGA" },
|
||||
{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
|
||||
{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
|
||||
{ DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
|
||||
{ DRM_MODE_CONNECTOR_Composite, "composite" },
|
||||
{ DRM_MODE_CONNECTOR_SVIDEO, "s-video" },
|
||||
{ DRM_MODE_CONNECTOR_LVDS, "LVDS" },
|
||||
{ DRM_MODE_CONNECTOR_Component, "component" },
|
||||
{ DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN" },
|
||||
{ DRM_MODE_CONNECTOR_DisplayPort, "DP" },
|
||||
{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
|
||||
{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
|
||||
{ DRM_MODE_CONNECTOR_TV, "TV" },
|
||||
{ DRM_MODE_CONNECTOR_eDP, "eDP" },
|
||||
{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
|
||||
{ DRM_MODE_CONNECTOR_DSI, "DSI" },
|
||||
};
|
||||
|
||||
const char *util_lookup_connector_type_name(unsigned int type)
|
||||
{
|
||||
return util_lookup_type_name(type, connector_type_names,
|
||||
ARRAY_SIZE(connector_type_names));
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* Copyright 2008 Tungsten Graphics
|
||||
* Jakob Bornecrantz <jakob@tungstengraphics.com>
|
||||
* Copyright 2008 Intel Corporation
|
||||
* Jesse Barnes <jesse.barnes@intel.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef UTIL_KMS_H
|
||||
#define UTIL_KMS_H
|
||||
|
||||
const char *util_lookup_encoder_type_name(unsigned int type);
|
||||
const char *util_lookup_connector_status_name(unsigned int type);
|
||||
const char *util_lookup_connector_type_name(unsigned int type);
|
||||
|
||||
#endif /* UTIL_KMS_H */
|
||||
Loading…
Reference in New Issue