drm/msm/a6xx: Remove cx gdsc polling using 'reset'
authorAkhil P Oommen <quic_akhilpo@quicinc.com>
Mon, 2 Jan 2023 10:48:30 +0000 (16:18 +0530)
committerRob Clark <robdclark@chromium.org>
Mon, 20 Mar 2023 17:53:47 +0000 (10:53 -0700)
Remove the unused 'reset' interface which was supposed to help to ensure
that cx gdsc has collapsed during gpu recovery. This is was not enabled
so far due to missing gpucc driver support. Similar functionality using
genpd framework will be implemented in the upcoming patch.

This effectively reverts commit 1f6cca404918
("drm/msm/a6xx: Ensure CX collapse during gpu recovery").

Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Patchwork: https://patchwork.freedesktop.org/patch/516470/
Link: https://lore.kernel.org/r/20230102161757.v5.4.I96e0bf9eaf96dd866111c1eec8a4c9b70fd7cbcb@changeid
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/adreno/a6xx_gpu.c
drivers/gpu/drm/msm/msm_gpu.c
drivers/gpu/drm/msm/msm_gpu.h

index 6faea5049f765dd64c2c895a48f2822fe9e21247..4e85ef0f581a1affb9a03c46db3a4386f3a5a8b5 100644 (file)
@@ -10,7 +10,6 @@
 
 #include <linux/bitfield.h>
 #include <linux/devfreq.h>
-#include <linux/reset.h>
 #include <linux/soc/qcom/llcc-qcom.h>
 
 #define GPU_PAS_ID 13
@@ -1304,9 +1303,6 @@ static void a6xx_recover(struct msm_gpu *gpu)
        /* And the final one from recover worker */
        pm_runtime_put_sync(&gpu->pdev->dev);
 
-       /* Call into gpucc driver to poll for cx gdsc collapse */
-       reset_control_reset(gpu->cx_collapse);
-
        pm_runtime_use_autosuspend(&gpu->pdev->dev);
 
        if (active_submits)
index 3802495003258a1258650a2c73c1a0572283dfc6..54d8659059eac64883bd62df0f60fc8df37cb573 100644 (file)
@@ -16,7 +16,6 @@
 #include <generated/utsrelease.h>
 #include <linux/string_helpers.h>
 #include <linux/devcoredump.h>
-#include <linux/reset.h>
 #include <linux/sched/task.h>
 
 /*
@@ -935,9 +934,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
        if (IS_ERR(gpu->gpu_cx))
                gpu->gpu_cx = NULL;
 
-       gpu->cx_collapse = devm_reset_control_get_optional_exclusive(&pdev->dev,
-                       "cx_collapse");
-
        gpu->pdev = pdev;
        platform_set_drvdata(pdev, &gpu->adreno_smmu);
 
index fc1c0d8611a82b300b48819bdebd494c3ab5c19a..0d261bbc09d4d630a249398f529e8ac894f6fcfd 100644 (file)
@@ -13,7 +13,6 @@
 #include <linux/interconnect.h>
 #include <linux/pm_opp.h>
 #include <linux/regulator/consumer.h>
-#include <linux/reset.h>
 
 #include "msm_drv.h"
 #include "msm_fence.h"
@@ -281,9 +280,6 @@ struct msm_gpu {
        bool hw_apriv;
 
        struct thermal_cooling_device *cooling;
-
-       /* To poll for cx gdsc collapse during gpu recovery */
-       struct reset_control *cx_collapse;
 };
 
 static inline struct msm_gpu *dev_to_gpu(struct device *dev)