UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/omap: convert dss_mgr_disconnect to accept omap_channel 

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disconnect() to accept 'enum omap_channel' instead of
'struct omap_overlay_manager'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2015-11-04 20:23:37 +02:00
parent 1b07b0664a
commit bdac3bb946
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -702,7 +702,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static const struct omapdss_dpi_ops dpi_ops = { static const struct omapdss_dpi_ops dpi_ops = {

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

@ -5002,7 +5002,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dssdev->name); dssdev->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -5020,7 +5020,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static const struct omapdss_dsi_ops dsi_ops = { static const struct omapdss_dsi_ops dsi_ops = {

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

@ -457,7 +457,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -475,7 +475,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static int hdmi_read_edid(struct omap_dss_device *dssdev, static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

@ -483,7 +483,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -501,7 +501,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static int hdmi_read_edid(struct omap_dss_device *dssdev, static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

@ -84,7 +84,7 @@ void dss_uninstall_mgr_ops(void);
int dss_mgr_connect(enum omap_channel channel, int dss_mgr_connect(enum omap_channel channel,
struct omap_dss_device *dst); struct omap_dss_device *dst);
void dss_mgr_disconnect(struct omap_overlay_manager *mgr, void dss_mgr_disconnect(enum omap_channel channel,
struct omap_dss_device *dst); struct omap_dss_device *dst);
void dss_mgr_set_timings(struct omap_overlay_manager *mgr, void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
const struct omap_video_timings *timings); const struct omap_video_timings *timings);

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

@ -195,10 +195,10 @@ int dss_mgr_connect(enum omap_channel channel,
} }
EXPORT_SYMBOL(dss_mgr_connect); EXPORT_SYMBOL(dss_mgr_connect);
void dss_mgr_disconnect(struct omap_overlay_manager *mgr, void dss_mgr_disconnect(enum omap_channel channel,
struct omap_dss_device *dst) struct omap_dss_device *dst)
{ {
dss_mgr_ops->disconnect(mgr->id, dst); dss_mgr_ops->disconnect(channel, dst);
} }
EXPORT_SYMBOL(dss_mgr_disconnect); EXPORT_SYMBOL(dss_mgr_disconnect);

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

@ -299,7 +299,7 @@ static int sdi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -317,7 +317,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static const struct omapdss_sdi_ops sdi_ops = { static const struct omapdss_sdi_ops sdi_ops = {

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

@ -761,7 +761,7 @@ static int venc_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(mgr, dssdev); dss_mgr_disconnect(mgr->id, dssdev);
return r; return r;
} }
@ -779,7 +779,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
if (dssdev->manager) if (dssdev->manager)
dss_mgr_disconnect(dssdev->manager, dssdev); dss_mgr_disconnect(dssdev->manager->id, dssdev);
} }
static const struct omapdss_atv_ops venc_ops = { static const struct omapdss_atv_ops venc_ops = {