The omapdss_find_output_from_display() function is only used to retrieve the dispc channel corresponding to the display. Return the dispc channel directly, and rename the function to omapdss_device_get_dispc_channel() to match its new purpose. The dssdev->id check is removed as the dssdev is guaranteed to be an output and have a non-zero id, as proved by the lack of crash despite the caller never checking the returned pointer before dereferencing it. As the function is not specific to outputs anymore, move it from output.c to base.c. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
185 lines
4.4 KiB
C
185 lines
4.4 KiB
C
/*
|
|
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
|
|
* Author: Archit Taneja <archit@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/of.h>
|
|
|
|
#include "dss.h"
|
|
#include "omapdss.h"
|
|
|
|
static DEFINE_MUTEX(output_lock);
|
|
|
|
int omapdss_output_set_device(struct omap_dss_device *out,
|
|
struct omap_dss_device *dssdev)
|
|
{
|
|
int r;
|
|
|
|
mutex_lock(&output_lock);
|
|
|
|
if (out->dst) {
|
|
dev_err(out->dev,
|
|
"output already has device %s connected to it\n",
|
|
out->dst->name);
|
|
r = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
if (out->output_type != dssdev->type) {
|
|
dev_err(out->dev, "output type and display type don't match\n");
|
|
r = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
mutex_unlock(&output_lock);
|
|
|
|
return 0;
|
|
err:
|
|
mutex_unlock(&output_lock);
|
|
|
|
return r;
|
|
}
|
|
EXPORT_SYMBOL(omapdss_output_set_device);
|
|
|
|
int omapdss_output_unset_device(struct omap_dss_device *out)
|
|
{
|
|
int r;
|
|
|
|
mutex_lock(&output_lock);
|
|
|
|
if (!out->dst) {
|
|
dev_err(out->dev,
|
|
"output doesn't have a device connected to it\n");
|
|
r = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
|
|
dev_err(out->dev,
|
|
"device %s is not disabled, cannot unset device\n",
|
|
out->dst->name);
|
|
r = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
mutex_unlock(&output_lock);
|
|
|
|
return 0;
|
|
err:
|
|
mutex_unlock(&output_lock);
|
|
|
|
return r;
|
|
}
|
|
EXPORT_SYMBOL(omapdss_output_unset_device);
|
|
|
|
int dss_install_mgr_ops(struct dss_device *dss,
|
|
const struct dss_mgr_ops *mgr_ops,
|
|
struct omap_drm_private *priv)
|
|
{
|
|
if (dss->mgr_ops)
|
|
return -EBUSY;
|
|
|
|
dss->mgr_ops = mgr_ops;
|
|
dss->mgr_ops_priv = priv;
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(dss_install_mgr_ops);
|
|
|
|
void dss_uninstall_mgr_ops(struct dss_device *dss)
|
|
{
|
|
dss->mgr_ops = NULL;
|
|
dss->mgr_ops_priv = NULL;
|
|
}
|
|
EXPORT_SYMBOL(dss_uninstall_mgr_ops);
|
|
|
|
int dss_mgr_connect(struct omap_dss_device *dssdev, struct omap_dss_device *dst)
|
|
{
|
|
return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel, dst);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_connect);
|
|
|
|
void dss_mgr_disconnect(struct omap_dss_device *dssdev,
|
|
struct omap_dss_device *dst)
|
|
{
|
|
dssdev->dss->mgr_ops->disconnect(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel, dst);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_disconnect);
|
|
|
|
void dss_mgr_set_timings(struct omap_dss_device *dssdev,
|
|
const struct videomode *vm)
|
|
{
|
|
dssdev->dss->mgr_ops->set_timings(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel, vm);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_set_timings);
|
|
|
|
void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev,
|
|
const struct dss_lcd_mgr_config *config)
|
|
{
|
|
dssdev->dss->mgr_ops->set_lcd_config(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel, config);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_set_lcd_config);
|
|
|
|
int dss_mgr_enable(struct omap_dss_device *dssdev)
|
|
{
|
|
return dssdev->dss->mgr_ops->enable(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_enable);
|
|
|
|
void dss_mgr_disable(struct omap_dss_device *dssdev)
|
|
{
|
|
dssdev->dss->mgr_ops->disable(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_disable);
|
|
|
|
void dss_mgr_start_update(struct omap_dss_device *dssdev)
|
|
{
|
|
dssdev->dss->mgr_ops->start_update(dssdev->dss->mgr_ops_priv,
|
|
dssdev->dispc_channel);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_start_update);
|
|
|
|
int dss_mgr_register_framedone_handler(struct omap_dss_device *dssdev,
|
|
void (*handler)(void *), void *data)
|
|
{
|
|
struct dss_device *dss = dssdev->dss;
|
|
|
|
return dss->mgr_ops->register_framedone_handler(dss->mgr_ops_priv,
|
|
dssdev->dispc_channel,
|
|
handler, data);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_register_framedone_handler);
|
|
|
|
void dss_mgr_unregister_framedone_handler(struct omap_dss_device *dssdev,
|
|
void (*handler)(void *), void *data)
|
|
{
|
|
struct dss_device *dss = dssdev->dss;
|
|
|
|
dss->mgr_ops->unregister_framedone_handler(dss->mgr_ops_priv,
|
|
dssdev->dispc_channel,
|
|
handler, data);
|
|
}
|
|
EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler);
|