Commit d4843012 authored by Akhil P Oommen's avatar Akhil P Oommen Committed by Rob Clark
Browse files

drm/msm/a6xx: Remove cx gdsc polling using 'reset' 



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 1f6cca40
("drm/msm/a6xx: Ensure CX collapse during gpu recovery").

Signed-off-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarPhilipp 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: default avatarRob Clark <robdclark@chromium.org>
parent ead5d3e5

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/msm/msm_gpu.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/msm/msm_gpu.h

+0 −4
Original line number Diff line number Diff line
@@ -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)