]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/msm/mdp5: Use the interconnect API
authorGeorgi Djakov <georgi.djakov@linaro.org>
Tue, 18 Jun 2019 22:10:16 +0000 (15:10 -0700)
committerRob Clark <robdclark@chromium.org>
Thu, 20 Jun 2019 15:39:24 +0000 (08:39 -0700)
The interconnect API provides an interface for consumer drivers to
express their bandwidth needs in the SoC. This data is aggregated
and the on-chip interconnect hardware is configured to the most
appropriate power/performance profile.

Use the API to configure the interconnects and request bandwidth
between DDR and the display hardware (MDP port(s) and rotator
downscaler).

v2: update the path names to be consistent with dpu, handle the NULL
    path case, updated commit msg from Georgi.
v3: split out icc setup into it's own function, and rework logic
    slightly so no interconnect paths is not fatal.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-By: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

index 97179bec8902fc500f78639b15eaee8cccbc1cee..1c55401956c493fdd826c996522461b0f9b6801c 100644 (file)
@@ -16,6 +16,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/interconnect.h>
 #include <linux/of_irq.h>
 
 #include "msm_drv.h"
@@ -1048,9 +1049,46 @@ static const struct component_ops mdp5_ops = {
        .unbind = mdp5_unbind,
 };
 
+static int mdp5_setup_interconnect(struct platform_device *pdev)
+{
+       struct icc_path *path0 = of_icc_get(&pdev->dev, "mdp0-mem");
+       struct icc_path *path1 = of_icc_get(&pdev->dev, "mdp1-mem");
+       struct icc_path *path_rot = of_icc_get(&pdev->dev, "rotator-mem");
+
+       if (IS_ERR(path0))
+               return PTR_ERR(path0);
+
+       if (!path0) {
+               /* no interconnect support is not necessarily a fatal
+                * condition, the platform may simply not have an
+                * interconnect driver yet.  But warn about it in case
+                * bootloader didn't setup bus clocks high enough for
+                * scanout.
+                */
+               dev_warn(&pdev->dev, "No interconnect support may cause display underflows!\n");
+               return 0;
+       }
+
+       icc_set_bw(path0, 0, MBps_to_icc(6400));
+
+       if (!IS_ERR_OR_NULL(path1))
+               icc_set_bw(path1, 0, MBps_to_icc(6400));
+       if (!IS_ERR_OR_NULL(path_rot))
+               icc_set_bw(path_rot, 0, MBps_to_icc(6400));
+
+       return 0;
+}
+
 static int mdp5_dev_probe(struct platform_device *pdev)
 {
+       int ret;
+
        DBG("");
+
+       ret = mdp5_setup_interconnect(pdev);
+       if (ret)
+               return ret;
+
        return component_add(&pdev->dev, &mdp5_ops);
 }