openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/omap: dss: Remove the dss_mgr_(dis)connect() operations 

The dss_mgr .connect() and .disconnect() are implemented as no-op in
omapdrm. The operations are unneeded, remove them.

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>
This commit is contained in:
Laurent Pinchart 2018-03-06 23:34:53 +02:00 committed by Tomi Valkeinen
parent 0f37938c7c
commit 43f7078f6b
9 changed files with 6 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@ -616,16 +616,10 @@ static int dpi_connect(struct omap_dss_device *src,
dpi_init_pll(dpi); dpi_init_pll(dpi);
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -636,8 +630,6 @@ static void dpi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static const struct omap_dss_device_ops dpi_ops = { static const struct omap_dss_device_ops dpi_ops = {

10
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -4886,16 +4886,10 @@ static int dsi_connect(struct omap_dss_device *src,
{ {
int r; int r;
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static const struct omap_dss_device_ops dsi_ops = { static const struct omap_dss_device_ops dsi_ops = {

10
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -433,16 +433,10 @@ static int hdmi_connect(struct omap_dss_device *src,
{ {
int r; int r;
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static int hdmi_read_edid(struct omap_dss_device *dssdev, static int hdmi_read_edid(struct omap_dss_device *dssdev,

10
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -438,16 +438,10 @@ static int hdmi_connect(struct omap_dss_device *src,
{ {
int r; int r;
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -458,8 +452,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static int hdmi_read_edid(struct omap_dss_device *dssdev, static int hdmi_read_edid(struct omap_dss_device *dssdev,

9
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@ -554,13 +554,6 @@ enum dss_writeback_channel {
}; };
struct dss_mgr_ops { struct dss_mgr_ops {
int (*connect)(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst);
void (*disconnect)(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst);
void (*start_update)(struct omap_drm_private *priv, void (*start_update)(struct omap_drm_private *priv,
enum omap_channel channel); enum omap_channel channel);
int (*enable)(struct omap_drm_private *priv, int (*enable)(struct omap_drm_private *priv,
@ -586,8 +579,6 @@ int dss_install_mgr_ops(struct dss_device *dss,
struct omap_drm_private *priv); struct omap_drm_private *priv);
void dss_uninstall_mgr_ops(struct dss_device *dss); void dss_uninstall_mgr_ops(struct dss_device *dss);
int dss_mgr_connect(struct omap_dss_device *dssdev);
void dss_mgr_disconnect(struct omap_dss_device *dssdev);
void dss_mgr_set_timings(struct omap_dss_device *dssdev, void dss_mgr_set_timings(struct omap_dss_device *dssdev,
const struct videomode *vm); const struct videomode *vm);
void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev, void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev,

14
drivers/gpu/drm/omapdrm/dss/output.c
View File

@ -56,20 +56,6 @@ void dss_uninstall_mgr_ops(struct dss_device *dss)
} }
EXPORT_SYMBOL(dss_uninstall_mgr_ops); EXPORT_SYMBOL(dss_uninstall_mgr_ops);
int dss_mgr_connect(struct omap_dss_device *dssdev)
{
return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
dssdev->dispc_channel, dssdev);
}
EXPORT_SYMBOL(dss_mgr_connect);
void dss_mgr_disconnect(struct omap_dss_device *dssdev)
{
dssdev->dss->mgr_ops->disconnect(dssdev->dss->mgr_ops_priv,
dssdev->dispc_channel, dssdev);
}
EXPORT_SYMBOL(dss_mgr_disconnect);
void dss_mgr_set_timings(struct omap_dss_device *dssdev, void dss_mgr_set_timings(struct omap_dss_device *dssdev,
const struct videomode *vm) const struct videomode *vm)
{ {

10
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -257,16 +257,10 @@ static int sdi_connect(struct omap_dss_device *src,
{ {
int r; int r;
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -277,8 +271,6 @@ static void sdi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static const struct omap_dss_device_ops sdi_ops = { static const struct omap_dss_device_ops sdi_ops = {

10
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@ -696,16 +696,10 @@ static int venc_connect(struct omap_dss_device *src,
{ {
int r; int r;
r = dss_mgr_connect(dst); r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) if (r)
return r; return r;
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
dss_mgr_disconnect(dst);
return r;
}
dst->dispc_channel_connected = true; dst->dispc_channel_connected = true;
return 0; return 0;
} }
@ -716,8 +710,6 @@ static void venc_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false; dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next); omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);
} }
static const struct omap_dss_device_ops venc_ops = { static const struct omap_dss_device_ops venc_ops = {

15
drivers/gpu/drm/omapdrm/omap_crtc.c
View File

@ -110,19 +110,6 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
*/ */
/* we can probably ignore these until we support command-mode panels: */ /* we can probably ignore these until we support command-mode panels: */
static int omap_crtc_dss_connect(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst)
{
return 0;
}
static void omap_crtc_dss_disconnect(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst)
{
}
static void omap_crtc_dss_start_update(struct omap_drm_private *priv, static void omap_crtc_dss_start_update(struct omap_drm_private *priv,
enum omap_channel channel) enum omap_channel channel)
{ {
@ -254,8 +241,6 @@ static void omap_crtc_dss_unregister_framedone(
} }
static const struct dss_mgr_ops mgr_ops = { static const struct dss_mgr_ops mgr_ops = {
.connect = omap_crtc_dss_connect,
.disconnect = omap_crtc_dss_disconnect,
.start_update = omap_crtc_dss_start_update, .start_update = omap_crtc_dss_start_update,
.enable = omap_crtc_dss_enable, .enable = omap_crtc_dss_enable,
.disable = omap_crtc_dss_disable, .disable = omap_crtc_dss_disable,