Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e2368a3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/panel/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux into drm-next 

drm/panel: Changes for v4.6-rc1

This contains a refactoring of parts of the DSI core to allow creating
DSI devices from non-DSI control busses (i.e. I2C, SPI, ...).

Other than that there's support for a couple of new panels as well as
a few cleanup patches.

* tag 'drm/panel/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux:
  drm/bridge: Make (pre/post) enable/disable callbacks optional
  drm/panel: simple: Add URT UMSH-8596MD-xT panels support
  dt-bindings: Add URT UMSH-8596MD-xT panel bindings
  of: Add United Radiant Technology Corporation vendor prefix
  drm/panel: simple: Support for LG lp120up1 panel
  dt-bindings: Add LG lp120up1 panel bindings
  drm/panel: simple: Fix g121x1_l03 hsync/vsync polarity
  drm/dsi: Get DSI host by DT device node
  drm/dsi: Add routine to unregister a DSI device
  drm/dsi: Try to match non-DT DSI devices
  drm/dsi: Use mipi_dsi_device_register_full() for DSI device creation
  drm/dsi: Check for CONFIG_OF when defining of_mipi_dsi_device_add()
parents 0e5dc9a8 c8a3b2ae

Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
LG 12.0" (1920x1280 pixels) TFT LCD panel



Required properties:

- compatible: should be "lg,lp120up1"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
United Radiant Technology UMSH-8596MD-xT 7.0" WVGA TFT LCD panel



Supported are LVDS versions (-11T, -19T) and parallel ones

(-T, -1T, -7T, -20T).



Required properties:

- compatible: should be one of:

  "urt,umsh-8596md-t",

  "urt,umsh-8596md-1t",

  "urt,umsh-8596md-7t",

  "urt,umsh-8596md-11t",

  "urt,umsh-8596md-19t",

  "urt,umsh-8596md-20t".



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ tplink TP-LINK Technologies Co., Ltd. 
tronfy	Tronfy

truly	Truly Semiconductors Limited

upisemi	uPI Semiconductor Corp.

urt	United Radiant Technology Corporation

usi	Universal Scientific Industrial Co., Ltd.

v3	V3 Semiconductor

variscite	Variscite Ltd.

drivers/gpu/drm/drm_bridge.c

+8 −4
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ void drm_bridge_disable(struct drm_bridge *bridge) 


	drm_bridge_disable(bridge->next);



	if (bridge->funcs->disable)

		bridge->funcs->disable(bridge);

}

EXPORT_SYMBOL(drm_bridge_disable);
@@ -206,6 +207,7 @@ void drm_bridge_post_disable(struct drm_bridge *bridge) 
	if (!bridge)

		return;



	if (bridge->funcs->post_disable)

		bridge->funcs->post_disable(bridge);



	drm_bridge_post_disable(bridge->next);
@@ -256,6 +258,7 @@ void drm_bridge_pre_enable(struct drm_bridge *bridge) 


	drm_bridge_pre_enable(bridge->next);



	if (bridge->funcs->pre_enable)

		bridge->funcs->pre_enable(bridge);

}

EXPORT_SYMBOL(drm_bridge_pre_enable);
@@ -276,6 +279,7 @@ void drm_bridge_enable(struct drm_bridge *bridge) 
	if (!bridge)

		return;



	if (bridge->funcs->enable)

		bridge->funcs->enable(bridge);



	drm_bridge_enable(bridge->next);

drivers/gpu/drm/drm_mipi_dsi.c

+115 −12
Original line number Diff line number Diff line
@@ -47,7 +47,17 @@ 


static int mipi_dsi_device_match(struct device *dev, struct device_driver *drv)

{

	return of_driver_match_device(dev, drv);

	struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);



	/* attempt OF style match */

	if (of_driver_match_device(dev, drv))

		return 1;



	/* compare DSI device and driver names */

	if (!strcmp(dsi->name, drv->name))

		return 1;



	return 0;

}



static const struct dev_pm_ops mipi_dsi_device_pm_ops = {
@@ -129,14 +139,20 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi) 
	return device_add(&dsi->dev);

}



#if IS_ENABLED(CONFIG_OF)

static struct mipi_dsi_device *

of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)

{

	struct mipi_dsi_device *dsi;

	struct device *dev = host->dev;

	struct mipi_dsi_device_info info = { };

	int ret;

	u32 reg;



	if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {

		dev_err(dev, "modalias failure on %s\n", node->full_name);

		return ERR_PTR(-EINVAL);

	}



	ret = of_property_read_u32(node, "reg", &reg);

	if (ret) {

		dev_err(dev, "device node %s has no valid reg property: %d\n",
@@ -144,32 +160,111 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) 
		return ERR_PTR(-EINVAL);

	}



	if (reg > 3) {

		dev_err(dev, "device node %s has invalid reg property: %u\n",

			node->full_name, reg);

	info.channel = reg;

	info.node = of_node_get(node);



	return mipi_dsi_device_register_full(host, &info);

}

#else

static struct mipi_dsi_device *

of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)

{

	return ERR_PTR(-ENODEV);

}

#endif



/**

 * mipi_dsi_device_register_full - create a MIPI DSI device

 * @host: DSI host to which this device is connected

 * @info: pointer to template containing DSI device information

 *

 * Create a MIPI DSI device by using the device information provided by

 * mipi_dsi_device_info template

 *

 * Returns:

 * A pointer to the newly created MIPI DSI device, or, a pointer encoded

 * with an error

 */

struct mipi_dsi_device *

mipi_dsi_device_register_full(struct mipi_dsi_host *host,

			      const struct mipi_dsi_device_info *info)

{

	struct mipi_dsi_device *dsi;

	struct device *dev = host->dev;

	int ret;



	if (!info) {

		dev_err(dev, "invalid mipi_dsi_device_info pointer\n");

		return ERR_PTR(-EINVAL);

	}



	if (info->channel > 3) {

		dev_err(dev, "invalid virtual channel: %u\n", info->channel);

		return ERR_PTR(-EINVAL);

	}



	dsi = mipi_dsi_device_alloc(host);

	if (IS_ERR(dsi)) {

		dev_err(dev, "failed to allocate DSI device %s: %ld\n",

			node->full_name, PTR_ERR(dsi));

		dev_err(dev, "failed to allocate DSI device %ld\n",

			PTR_ERR(dsi));

		return dsi;

	}



	dsi->dev.of_node = of_node_get(node);

	dsi->channel = reg;

	dsi->dev.of_node = info->node;

	dsi->channel = info->channel;

	strlcpy(dsi->name, info->type, sizeof(dsi->name));



	ret = mipi_dsi_device_add(dsi);

	if (ret) {

		dev_err(dev, "failed to add DSI device %s: %d\n",

			node->full_name, ret);

		dev_err(dev, "failed to add DSI device %d\n", ret);

		kfree(dsi);

		return ERR_PTR(ret);

	}



	return dsi;

}

EXPORT_SYMBOL(mipi_dsi_device_register_full);



/**

 * mipi_dsi_device_unregister - unregister MIPI DSI device

 * @dsi: DSI peripheral device

 */

void mipi_dsi_device_unregister(struct mipi_dsi_device *dsi)

{

	device_unregister(&dsi->dev);

}

EXPORT_SYMBOL(mipi_dsi_device_unregister);



static DEFINE_MUTEX(host_lock);

static LIST_HEAD(host_list);



/**

 * of_find_mipi_dsi_host_by_node() - find the MIPI DSI host matching a

 *				     device tree node

 * @node: device tree node

 *

 * Returns:

 * A pointer to the MIPI DSI host corresponding to @node or NULL if no

 * such device exists (or has not been registered yet).

 */

struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node)

{

	struct mipi_dsi_host *host;



	mutex_lock(&host_lock);



	list_for_each_entry(host, &host_list, list) {

		if (host->dev->of_node == node) {

			mutex_unlock(&host_lock);

			return host;

		}

	}



	mutex_unlock(&host_lock);



	return NULL;

}

EXPORT_SYMBOL(of_find_mipi_dsi_host_by_node);



int mipi_dsi_host_register(struct mipi_dsi_host *host)

{
@@ -182,6 +277,10 @@ int mipi_dsi_host_register(struct mipi_dsi_host *host) 
		of_mipi_dsi_device_add(host, node);

	}



	mutex_lock(&host_lock);

	list_add_tail(&host->list, &host_list);

	mutex_unlock(&host_lock);



	return 0;

}

EXPORT_SYMBOL(mipi_dsi_host_register);
@@ -190,7 +289,7 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) 
{

	struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);



	device_unregister(&dsi->dev);

	mipi_dsi_device_unregister(dsi);



	return 0;

}
@@ -198,6 +297,10 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) 
void mipi_dsi_host_unregister(struct mipi_dsi_host *host)

{

	device_for_each_child(host->dev, NULL, mipi_dsi_remove_device_fn);



	mutex_lock(&host_lock);

	list_del_init(&host->list);

	mutex_unlock(&host_lock);

}

EXPORT_SYMBOL(mipi_dsi_host_unregister);