drm: omapdrm: dss: Pass DSS pointer to dss_get_*_clk_source()

This removes the need to access the global DSS private data in those
functions (both for the current accesses and the future ones that will
be introduced when allocating the DSS device dynamically).

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 71f86a5d4029..26f4122f6784 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1286,8 +1286,10 @@ static unsigned long dsi_fclk_rate(struct platform_device *dsidev)
 {
         unsigned long r;
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        enum dss_clk_source source;
 
-        if (dss_get_dsi_clk_source(dsi->module_id) == DSS_CLK_SRC_FCK) {
+        source = dss_get_dsi_clk_source(dsi->dss, dsi->module_id);
+        if (source == DSS_CLK_SRC_FCK) {
                 /* DSI FCLK source is DSS_CLK_FCK */
                 r = clk_get_rate(dsi->dss_clk);
         } else {
@@ -1506,8 +1508,8 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
         int dsi_module = dsi->module_id;
         struct dss_pll *pll = &dsi->pll;
 
-        dispc_clk_src = dss_get_dispc_clk_source();
-        dsi_clk_src = dss_get_dsi_clk_source(dsi_module);
+        dispc_clk_src = dss_get_dispc_clk_source(dsi->dss);
+        dsi_clk_src = dss_get_dsi_clk_source(dsi->dss, dsi_module);
 
         if (dsi_runtime_get(dsidev))
                 return;