AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/omap: remove use of omapdss_find_mgr_from_display()

Browse Source 
In order to remove uses of 'struct omap_overlay_manager' we need to get
rid of using omapdss_find_mgr_from_display() when initializing omapdrm.

Instead of using omapdss_find_mgr_from_display() and mgr->id to find the
dispc channel used for the given display, we can instead use
omapdss_find_output_from_display(), and get the output->dispc_channel
from there.

We can also remove omapdss_find_mgr_from_display() as it's no longer
used.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2015-10-21 16:17:23 +03:00
parent 3a92413864
commit 179df15fc5
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,24 +169,6 @@ struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device
} }
EXPORT_SYMBOL(omapdss_find_output_from_display); EXPORT_SYMBOL(omapdss_find_output_from_display);
struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev)
{
struct omap_dss_device *out;
struct omap_overlay_manager *mgr;
out = omapdss_find_output_from_display(dssdev);
if (out == NULL)
return NULL;
mgr = out->manager;
omap_dss_put_device(out);
return mgr;
}
EXPORT_SYMBOL(omapdss_find_mgr_from_display);
static const struct dss_mgr_ops *dss_mgr_ops; static const struct dss_mgr_ops *dss_mgr_ops;
int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops) int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops)

8
drivers/gpu/drm/omapdrm/omap_drv.c
View File

@ -352,7 +352,7 @@ static int omap_modeset_init(struct drm_device *dev)
struct drm_connector *connector; struct drm_connector *connector;
struct drm_encoder *encoder; struct drm_encoder *encoder;
enum omap_channel channel; enum omap_channel channel;
struct omap_overlay_manager *mgr; struct omap_dss_device *out;
if (!omapdss_device_is_connected(dssdev)) if (!omapdss_device_is_connected(dssdev))
continue; continue;
@ -399,8 +399,10 @@ static int omap_modeset_init(struct drm_device *dev)
* not considered. * not considered.
*/ */
mgr = omapdss_find_mgr_from_display(dssdev); out = omapdss_find_output_from_display(dssdev);
channel = mgr->id; channel = out->dispc_channel;
omap_dss_put_device(out);
/* /*
* if this channel hasn't already been taken by a previously * if this channel hasn't already been taken by a previously
* allocated crtc, we create a new crtc for it * allocated crtc, we create a new crtc for it