raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drm: Look for an alias for the displays to use as the DRM device name

Browse Source 
Allow DT aliases of eg DSI2 to force make DRM allocate the
display with the requested name.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This commit is contained in:
Dave Stevenson
2023-09-28 18:27:09 +01:00
committed by Dom Cobley
parent 9d603d1c70
commit a2bf9deb64
1 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/gpu/drm/drm_connector.c
View File

@@ -33,6 +33,7 @@
#include <drm/drm_sysfs.h> #include <drm/drm_sysfs.h>
#include <drm/drm_utils.h> #include <drm/drm_utils.h>
#include <linux/of.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
@@ -83,6 +84,7 @@ struct drm_conn_prop_enum_list {
int type; int type;
const char *name; const char *name;
struct ida ida; struct ida ida;
int first_dyn_num;
}; };
/* /*
@@ -112,12 +114,41 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = {
{ DRM_MODE_CONNECTOR_USB, "USB" }, { DRM_MODE_CONNECTOR_USB, "USB" },
}; };
#define MAX_DT_NODE_NAME_LEN 20
#define DT_DRM_NODE_PREFIX "drm_"
static void drm_connector_get_of_name(int type, char *node_name, int length)
{
int i = 0;
strcpy(node_name, DT_DRM_NODE_PREFIX);
do {
node_name[i + strlen(DT_DRM_NODE_PREFIX)] =
tolower(drm_connector_enum_list[type].name[i]);
} while (drm_connector_enum_list[type].name[i++] &&
i < length);
node_name[length - 1] = '\0';
}
void drm_connector_ida_init(void) void drm_connector_ida_init(void)
{ {
int i; int i, id;
char node_name[MAX_DT_NODE_NAME_LEN];
for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++) for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++) {
ida_init(&drm_connector_enum_list[i].ida); ida_init(&drm_connector_enum_list[i].ida);
drm_connector_get_of_name(i, node_name, MAX_DT_NODE_NAME_LEN);
id = of_alias_get_highest_id(node_name);
if (id > 0)
drm_connector_enum_list[i].first_dyn_num = id + 1;
else
drm_connector_enum_list[i].first_dyn_num = 1;
}
} }
void drm_connector_ida_destroy(void) void drm_connector_ida_destroy(void)
@@ -225,7 +256,9 @@ static int __drm_connector_init(struct drm_device *dev,
struct i2c_adapter *ddc) struct i2c_adapter *ddc)
{ {
struct drm_mode_config *config = &dev->mode_config; struct drm_mode_config *config = &dev->mode_config;
char node_name[MAX_DT_NODE_NAME_LEN];
int ret; int ret;
int id;
struct ida *connector_ida = struct ida *connector_ida =
&drm_connector_enum_list[connector_type].ida; &drm_connector_enum_list[connector_type].ida;
@@ -255,8 +288,28 @@ static int __drm_connector_init(struct drm_device *dev,
ret = 0; ret = 0;
connector->connector_type = connector_type; connector->connector_type = connector_type;
connector->connector_type_id = connector->connector_type_id = 0;
ida_alloc_min(connector_ida, 1, GFP_KERNEL);
drm_connector_get_of_name(connector_type, node_name, MAX_DT_NODE_NAME_LEN);
id = of_alias_get_id(dev->dev->of_node, node_name);
if (id > 0) {
/* Try and allocate the requested ID
* Valid range is 1 to 31, hence ignoring 0 as an error
*/
int type_id = ida_alloc_range(connector_ida, id, id, GFP_KERNEL);
if (type_id > 0)
connector->connector_type_id = type_id;
else
drm_err(dev, "Failed to acquire type ID %d for interface type %s, ret %d\n",
id, drm_connector_enum_list[connector_type].name,
type_id);
}
if (!connector->connector_type_id)
connector->connector_type_id =
ida_alloc_min(connector_ida,
drm_connector_enum_list[connector_type].first_dyn_num,
GFP_KERNEL);
if (connector->connector_type_id < 0) { if (connector->connector_type_id < 0) {
ret = connector->connector_type_id; ret = connector->connector_type_id;
goto out_put_id; goto out_put_id;