drm/msm: dpu: Clean up runtime power handling

From: Sean Paul <[email protected]>

It's only used for debugfs, so just output the enum value instead.

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c         |  6 ++----
 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 14 --------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h |  7 -------
 3 files changed, 2 insertions(+), 25 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -4

index ed84cf44a222..e09209d6c469 100644
@@ -1381,11 +1381,9 @@ static int dpu_crtc_debugfs_state_show(struct
 seq_file *s, void *v)
 			dpu_crtc->cur_perf.core_clk_rate);
 	for (i = DPU_POWER_HANDLE_DBUS_ID_MNOC;
 			i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
-		seq_printf(s, "bw_ctl[%s]: %llu\n",
-				dpu_power_handle_get_dbus_name(i),
+		seq_printf(s, "bw_ctl[%d]: %llu\n", i,
 				dpu_crtc->cur_perf.bw_ctl[i]);
-		seq_printf(s, "max_per_pipe_ib[%s]: %llu\n",
-				dpu_power_handle_get_dbus_name(i),
+		seq_printf(s, "max_per_pipe_ib[%d]: %llu\n", i,
 				dpu_crtc->cur_perf.max_per_pipe_ib[i]);
 	}

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -14

index fc14116789f2..8c6f92aaaf87 100644
@@ -24,20 +24,6 @@
 #include "dpu_power_handle.h"
 #include "dpu_trace.h"
 
-static const char *data_bus_name[DPU_POWER_HANDLE_DBUS_ID_MAX] = {
-	[DPU_POWER_HANDLE_DBUS_ID_MNOC] = "qcom,dpu-data-bus",
-	[DPU_POWER_HANDLE_DBUS_ID_LLCC] = "qcom,dpu-llcc-bus",
-	[DPU_POWER_HANDLE_DBUS_ID_EBI] = "qcom,dpu-ebi-bus",
-};
-
-const char *dpu_power_handle_get_dbus_name(u32 bus_id)
-{
-	if (bus_id < DPU_POWER_HANDLE_DBUS_ID_MAX)
-		return data_bus_name[bus_id];
-
-	return NULL;
-}
-
 static void dpu_power_event_trigger_locked(struct dpu_power_handle
 *phandle,
 		u32 event_type)

{

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -2

index a65b7a297f21..f627ae28ec68 100644
@@ -207,11 +207,4 @@ struct dpu_power_event
 *dpu_power_handle_register_event(
 void dpu_power_handle_unregister_event(struct dpu_power_handle 
 *phandle,
 		struct dpu_power_event *event);
 
-/**
- * dpu_power_handle_get_dbus_name - get name of given data bus 

identifier
- * @bus_id: data bus identifier
- * Return: Pointer to name string if success; NULL otherwise
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -2

-const char *dpu_power_handle_get_dbus_name(u32 bus_id);
-
 #endif /* _DPU_POWER_HANDLE_H_ */

From: Sean Paul <[email protected]>

There's only one client -- core, and it's only used for runtime pm which is already refcounted.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       | 22 +----
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h       |  1 -
 .../gpu/drm/msm/disp/dpu1/dpu_power_handle.c  | 96 +------------------
 .../gpu/drm/msm/disp/dpu1/dpu_power_handle.h  | 86 +----------------
 4 files changed, 6 insertions(+), 199 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -5

index 985c855796ae..23094d108e81 100644
@@ -676,11 +676,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms
 *dpu_kms)
 		dpu_hw_catalog_deinit(dpu_kms->catalog);
 	dpu_kms->catalog = NULL;
 
-	if (dpu_kms->core_client)
-		dpu_power_client_destroy(&dpu_kms->phandle,
-			dpu_kms->core_client);
-	dpu_kms->core_client = NULL;
-
 	if (dpu_kms->vbif[VBIF_NRT])
 		devm_iounmap(&dpu_kms->pdev->dev,

dpu_kms->vbif[VBIF_NRT]);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -11

 	dpu_kms->vbif[VBIF_NRT] = NULL;

@@ -913,17 +908,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
 		dpu_kms->reg_dma_len = dpu_iomap_size(dpu_kms->pdev,
 "regdma");
 	}
 
-	dpu_kms->core_client = dpu_power_client_create(&dpu_kms->phandle,
-					"core");
-	if (IS_ERR_OR_NULL(dpu_kms->core_client)) {
-		rc = PTR_ERR(dpu_kms->core_client);
-		if (!dpu_kms->core_client)
-			rc = -EINVAL;
-		DPU_ERROR("dpu power client create failed: %d\n", rc);
-		dpu_kms->core_client = NULL;
-		goto error;
-	}
-
 	pm_runtime_get_sync(&dpu_kms->pdev->dev);
 

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

 	_dpu_kms_core_hw_rev_init(dpu_kms);

@@ -1157,8 +1141,7 @@ static int __maybe_unused 

dpu_runtime_suspend(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -2

 		return rc;
 	}
 
-	rc = dpu_power_resource_enable(&dpu_kms->phandle,
-			dpu_kms->core_client, false);
+	rc = dpu_power_resource_enable(&dpu_kms->phandle, false);
 	if (rc)
 		DPU_ERROR("resource disable failed: %d\n", rc);

@@ -1189,8 +1172,7 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -2

 		return rc;
 	}
 
-	rc = dpu_power_resource_enable(&dpu_kms->phandle,
-			dpu_kms->core_client, true);
+	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -1

index 2a3625eef6d3..f2c78deb0854 100644
@@ -114,7 +114,6 @@ struct dpu_kms {
 	struct dpu_mdss_cfg *catalog;
 
 	struct dpu_power_handle phandle;
-	struct dpu_power_client *core_client;
 	struct dpu_power_event *power_event;
 
 	/* directory entry for debugfs */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -48

index 8c6f92aaaf87..8e64f0a52147 100644
@@ -35,59 +35,11 @@ static void dpu_power_event_trigger_locked(struct
 dpu_power_handle *phandle,
 	}
 }
 
-struct dpu_power_client *dpu_power_client_create(
-	struct dpu_power_handle *phandle, char *client_name)
-{
-	struct dpu_power_client *client;
-	static u32 id;
-
-	if (!client_name || !phandle) {
-		pr_err("client name is null or invalid power data\n");
-		return ERR_PTR(-EINVAL);
-	}
-
-	client = kzalloc(sizeof(struct dpu_power_client), GFP_KERNEL);
-	if (!client)
-		return ERR_PTR(-ENOMEM);
-
-	mutex_lock(&phandle->phandle_lock);
-	strlcpy(client->name, client_name, MAX_CLIENT_NAME_LEN);
-	client->usecase_ndx = VOTE_INDEX_DISABLE;
-	client->id = id;
-	client->active = true;
-	pr_debug("client %s created:%pK id :%d\n", client_name,
-		client, id);
-	id++;
-	list_add(&client->list, &phandle->power_client_clist);
-	mutex_unlock(&phandle->phandle_lock);
-
-	return client;
-}
-
-void dpu_power_client_destroy(struct dpu_power_handle *phandle,
-	struct dpu_power_client *client)
-{
-	if (!client  || !phandle) {
-		pr_err("reg bus vote: invalid client handle\n");
-	} else if (!client->active) {
-		pr_err("dpu power deinit already done\n");
-		kfree(client);
-	} else {
-		pr_debug("bus vote client %s destroyed:%pK id:%u\n",
-			client->name, client, client->id);
-		mutex_lock(&phandle->phandle_lock);
-		list_del_init(&client->list);
-		mutex_unlock(&phandle->phandle_lock);
-		kfree(client);
-	}
-}
-
 void dpu_power_resource_init(struct platform_device *pdev,
 	struct dpu_power_handle *phandle)
 {
 	phandle->dev = &pdev->dev;
 
-	INIT_LIST_HEAD(&phandle->power_client_clist);
 	INIT_LIST_HEAD(&phandle->event_list);
 

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -1

 	mutex_init(&phandle->phandle_lock);

@@ -96,7 +48,6 @@ void dpu_power_resource_init(struct platform_device
 *pdev,
 void dpu_power_resource_deinit(struct platform_device *pdev,
 	struct dpu_power_handle *phandle)
 {
-	struct dpu_power_client *curr_client, *next_client;
 	struct dpu_power_event *curr_event, *next_event;
 

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -0

 	if (!phandle || !pdev) {

@@ -105,15 +56,6 @@ void dpu_power_resource_deinit(struct 

platform_device
*pdev,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -9

 	}
 
 	mutex_lock(&phandle->phandle_lock);
-	list_for_each_entry_safe(curr_client, next_client,
-			&phandle->power_client_clist, list) {
-		pr_err("client:%s-%d still registered with refcount:%d\n",
-				curr_client->name, curr_client->id,
-				curr_client->refcount);
-		curr_client->active = false;
-		list_del(&curr_client->list);
-	}
-
 	list_for_each_entry_safe(curr_event, next_event,
 			&phandle->event_list, list) {
 		pr_err("event:%d, client:%s still registered\n",

@@ -125,53 +67,21 @@ void dpu_power_resource_deinit(struct 

platform_device
*pdev,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +1 -2

 	mutex_unlock(&phandle->phandle_lock);
 }
 
-int dpu_power_resource_enable(struct dpu_power_handle *phandle,
-	struct dpu_power_client *pclient, bool enable)
+int dpu_power_resource_enable(struct dpu_power_handle *phandle, bool

enable)
{

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +1 -27

-	bool changed = false;
-	u32 max_usecase_ndx = VOTE_INDEX_DISABLE, prev_usecase_ndx;
-	struct dpu_power_client *client;
 	u32 event_type;
 
-	if (!phandle || !pclient) {
+	if (!phandle) {
 		pr_err("invalid input argument\n");
 		return -EINVAL;
 	}
 
 	mutex_lock(&phandle->phandle_lock);
-	if (enable)
-		pclient->refcount++;
-	else if (pclient->refcount)
-		pclient->refcount--;
-
-	if (pclient->refcount)
-		pclient->usecase_ndx = VOTE_INDEX_LOW;
-	else
-		pclient->usecase_ndx = VOTE_INDEX_DISABLE;
-
-	list_for_each_entry(client, &phandle->power_client_clist, list) {
-		if (client->usecase_ndx < VOTE_INDEX_MAX &&
-		    client->usecase_ndx > max_usecase_ndx)
-			max_usecase_ndx = client->usecase_ndx;
-	}
-
-	if (phandle->current_usecase_ndx != max_usecase_ndx) {
-		changed = true;
-		prev_usecase_ndx = phandle->current_usecase_ndx;
-		phandle->current_usecase_ndx = max_usecase_ndx;
-	}
-
-	pr_debug("%pS: changed=%d current idx=%d request client %s id:%u

enable:%d refcount:%d\n",

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +0 -5

-		__builtin_return_address(0), changed, max_usecase_ndx,
-		pclient->name, pclient->id, enable, pclient->refcount);
-
-	if (!changed)
-		goto end;
 
 	event_type = enable ? DPU_POWER_EVENT_ENABLE :

DPU_POWER_EVENT_DISABLE;

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +1 -1

 	dpu_power_event_trigger_locked(phandle,	event_type);
-end:
+
 	mutex_unlock(&phandle->phandle_lock);
 	return 0;
 }

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -16

index f627ae28ec68..124ebc93c877 100644
@@ -27,30 +27,6 @@
 #define DPU_POWER_EVENT_DISABLE	BIT(0)
 #define DPU_POWER_EVENT_ENABLE	BIT(1)
 
-/**
- * mdss_bus_vote_type: register bus vote type
- * VOTE_INDEX_DISABLE: removes the client vote
- * VOTE_INDEX_LOW: keeps the lowest vote for register bus
- * VOTE_INDEX_MAX: invalid
- */
-enum mdss_bus_vote_type {
-	VOTE_INDEX_DISABLE,
-	VOTE_INDEX_LOW,
-	VOTE_INDEX_MAX,
-};
-
-/**
- * enum dpu_power_handle_data_bus_client - type of axi bus clients
- * @DPU_POWER_HANDLE_DATA_BUS_CLIENT_RT: core real-time bus client
- * @DPU_POWER_HANDLE_DATA_BUS_CLIENT_NRT: core non-real-time bus 

client
- * @DPU_POWER_HANDLE_DATA_BUS_CLIENT_MAX: maximum number of bus client type
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -33

-enum dpu_power_handle_data_bus_client {
-	DPU_POWER_HANDLE_DATA_BUS_CLIENT_RT,
-	DPU_POWER_HANDLE_DATA_BUS_CLIENT_NRT,
-	DPU_POWER_HANDLE_DATA_BUS_CLIENT_MAX
-};
-
 /**
  * enum DPU_POWER_HANDLE_DBUS_ID - data bus identifier
  * @DPU_POWER_HANDLE_DBUS_ID_MNOC: DPU/MNOC data bus

@@ -64,31 +40,6 @@ enum DPU_POWER_HANDLE_DBUS_ID {
 	DPU_POWER_HANDLE_DBUS_ID_MAX,
 };
 
-/**
- * struct dpu_power_client: stores the power client for dpu driver
- * @name:	name of the client
- * @usecase_ndx: current regs bus vote type
- * @refcount:	current refcount if multiple modules are using same
- *              same client for enable/disable. Power module will
- *              aggregate the refcount and vote accordingly for this
- *              client.
- * @id:		assigned during create. helps for debugging.
- * @list:	list to attach power handle master list
- * @ab:         arbitrated bandwidth for each bus client
- * @ib:         instantaneous bandwidth for each bus client
- * @active:	inidcates the state of dpu power handle
- */
-struct dpu_power_client {
-	char name[MAX_CLIENT_NAME_LEN];
-	short usecase_ndx;
-	short refcount;
-	u32 id;
-	struct list_head list;
-	u64 ab[DPU_POWER_HANDLE_DATA_BUS_CLIENT_MAX];
-	u64 ib[DPU_POWER_HANDLE_DATA_BUS_CLIENT_MAX];
-	bool active;
-};
-
 /*
  * struct dpu_power_event - local event registration structure
  * @client_name: name of the client registering

@@ -109,14 +60,12 @@ struct dpu_power_event {
 
 /**
  * struct dpu_power_handle: power handle main struct
- * @client_clist: master list to store all clients
  * @phandle_lock: lock to synchronize the enable/disable
  * @dev: pointer to device structure
  * @usecase_ndx: current usecase index
  * @event_list: current power handle event list
  */
 struct dpu_power_handle {
-	struct list_head power_client_clist;
 	struct mutex phandle_lock;
 	struct device *dev;
 	u32 current_usecase_ndx;

@@ -141,47 +90,14 @@ void dpu_power_resource_init(struct 

platform_device
*pdev,
void dpu_power_resource_deinit(struct platform_device *pdev,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -8

 	struct dpu_power_handle *pdata);
 
-/**
- * dpu_power_client_create() - create the client on power handle
- * @pdata:  power handle containing the resources
- * @client_name: new client name for registration
- *
- * Return: error code.
- */
-struct dpu_power_client *dpu_power_client_create(struct 

dpu_power_handle
*pdata,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -18

-	char *client_name);
-
-/**
- * dpu_power_client_destroy() - destroy the client on power handle
- * @pdata:  power handle containing the resources
- * @client_name: new client name for registration
- *
- * Return: none
- */
-void dpu_power_client_destroy(struct dpu_power_handle *phandle,
-	struct dpu_power_client *client);
-
 /**
  * dpu_power_resource_enable() - enable/disable the power resources
  * @pdata:  power handle containing the resources
- * @client: client information to enable/disable its vote
  * @enable: boolean request for enable/disable
  *
  * Return: error code.
  */
-int dpu_power_resource_enable(struct dpu_power_handle *pdata,
-	struct dpu_power_client *pclient, bool enable);
-
-/**
- * dpu_power_data_bus_bandwidth_ctrl() - control data bus bandwidth

enable
- * @phandle: power handle containing the resources
- * @client: client information to bandwidth control
- * @enable: true to enable bandwidth for data base
- *
- * Return: none
- */
-void dpu_power_data_bus_bandwidth_ctrl(struct dpu_power_handle *phandle,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +1 -1

-		struct dpu_power_client *pclient, int enable);
+int dpu_power_resource_enable(struct dpu_power_handle *pdata, bool

enable);

/**
* dpu_power_handle_register_event - register a callback function for
an
event.

From: Sean Paul <[email protected]>

It's needed for struct dss_module_power, and is currently being pulled in by dpu_power_handle.h

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 +
 1 file changed, 1 insertion(+)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +1 -0

index 5f08be187c86..4e5acacb3065 100644
@@ -29,6 +29,7 @@
 #include "dpu_hw_lm.h"
 #include "dpu_hw_interrupts.h"
 #include "dpu_hw_top.h"
+#include "dpu_io_util.h"
 #include "dpu_rm.h"
 #include "dpu_power_handle.h"
 #include "dpu_irq.h"

From: Sean Paul <[email protected]>

enc_spinlock instead of enc_spin_lock.

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -0

index 82c55efb500f..10a0676d1dcf 100644
@@ -130,7 +130,7 @@ enum dpu_enc_rc_states {
  *	Virtual encoder defers as much as possible to the physical

encoders.
* Virtual encoder registers itself with the DRM Framework as the
encoder.
* @base: drm_encoder base class for registration with DRM
- * @enc_spin_lock: Virtual-Encoder-Wide Spin Lock for IRQ purposes
+ * @enc_spinlock: Virtual-Encoder-Wide Spin Lock for IRQ purposes
* @bus_scaling_client: Client handle to the bus scaling interface
* @num_phys_encs: Actual number of physical encoders contained.
* @phys_encs: Container of physical encoders managed.

From: Sean Paul <[email protected]>

The crtc runtime resume doesn't actually operate on the crtc, but rather its encoders. The problem with this is that we need to inspect the crtc state to get the currently connected encoders. Since runtime resume isn't guaranteed to be called while holding the modeset locks (although it sometimes is), this presents a race condition.

Now that we have ->enabled on the virtual encoders, and a lock to protect it, just call resume on each encoder and only restore the ones that are enabled.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c    | 24 ---------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h    |  6 ------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 +++++++++------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c     |  6 +++---
 5 files changed, 15 insertions(+), 49 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9

index d8f58caf2772..9be24907f8c1 100644
@@ -841,30 +841,6 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 	return &cstate->base;
 }
 
-void dpu_crtc_runtime_resume(struct drm_crtc *crtc)
-{
-	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
-	struct drm_encoder *encoder;
-
-	mutex_lock(&dpu_crtc->crtc_lock);
-
-	if (!dpu_crtc->enabled)
-		goto end;

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5

-
-end:
-	mutex_unlock(&dpu_crtc->crtc_lock);
-}
-
 static void dpu_crtc_disable(struct drm_crtc *crtc)
 {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0

 	struct dpu_crtc *dpu_crtc;

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2

index 1dca91d1210f..93d21a61a040 100644
@@ -329,10 +329,4 @@ static inline bool dpu_crtc_is_enabled(struct
 drm_crtc *crtc)
 	return crtc ? crtc->enabled : false;
 }
 
-/**
- * dpu_crtc_runtime_resume - called by the top-level on 

pm_runtime_resume
- * @crtc: CRTC to resume
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2

-void dpu_crtc_runtime_resume(struct drm_crtc *crtc);
-
 #endif /* _DPU_CRTC_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -0

index 3daa86220d47..d89ac520f7e6 100644
@@ -1089,28 +1089,24 @@ static void 

_dpu_encoder_virt_enable_helper(struct
drm_encoder *drm_enc)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +3 -12

 	_dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
 }
 
-void dpu_encoder_virt_restore(struct drm_encoder *drm_enc)
+void dpu_encoder_virt_runtime_resume(struct drm_encoder *drm_enc)
 {
-	struct dpu_encoder_virt *dpu_enc = NULL;
-	int i;
-
-	if (!drm_enc) {
-		DPU_ERROR("invalid encoder\n");
-		return;
-	}
-	dpu_enc = to_dpu_encoder_virt(drm_enc);
+	struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc);
 
-	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
-		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
+	mutex_lock(&dpu_enc->enc_lock);
 
-		if (phys && (phys != dpu_enc->cur_master) &&

phys->ops.restore)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +7 -2

-			phys->ops.restore(phys);
-	}
+	if (!dpu_enc->enabled)
+		goto out;
 
+	if (dpu_enc->cur_slave && dpu_enc->cur_slave->ops.restore)
+		dpu_enc->cur_slave->ops.restore(dpu_enc->cur_slave);
 	if (dpu_enc->cur_master && dpu_enc->cur_master->ops.restore)
 		dpu_enc->cur_master->ops.restore(dpu_enc->cur_master);
 
 	_dpu_encoder_virt_enable_helper(drm_enc);
+
+out:
+	mutex_unlock(&dpu_enc->enc_lock);
 }
 
 static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -1

index 9dbf38f446d9..aa4f135218fa 100644
@@ -126,10 +126,10 @@ int dpu_encoder_wait_for_event(struct drm_encoder
 *drm_encoder,
 enum dpu_intf_mode dpu_encoder_get_intf_mode(struct drm_encoder
 *encoder);
 
 /**
- * dpu_encoder_virt_restore - restore the encoder configs
+ * dpu_encoder_virt_runtime_resume - pm runtime resume the encoder

configs
* @encoder: encoder pointer
*/

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -1

-void dpu_encoder_virt_restore(struct drm_encoder *encoder);
+void dpu_encoder_virt_runtime_resume(struct drm_encoder *encoder);
 
 /**
  * dpu_encoder_init - initialize virtual encoder object

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

index e42685a1d928..c385eab7e441 100644
@@ -1132,7 +1132,7 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1

 	int rc = -1;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dpu_kms *dpu_kms = platform_get_drvdata(pdev);
-	struct drm_crtc *crtc;
+	struct drm_encoder *encoder;
 	struct drm_device *ddev;
 	struct dss_module_power *mp = &dpu_kms->mp;

@@ -1150,8 +1150,8 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -2

 	dpu_vbif_init_memtypes(dpu_kms);
 
-	drm_for_each_crtc(crtc, ddev)
-		dpu_crtc_runtime_resume(crtc);
+	drm_for_each_encoder(encoder, ddev)
+		dpu_encoder_virt_runtime_resume(encoder);
 
 	return rc;
 }

Quoted 45 lines · Sean Paul

From: Sean Paul <[email protected]>

The crtc runtime resume doesn't actually operate on the crtc, but rather its encoders. The problem with this is that we need to inspect the crtc state to get the currently connected encoders. Since runtime resume isn't guaranteed to be called while holding the modeset locks (although it sometimes is), this presents a race condition.

Now that we have ->enabled on the virtual encoders, and a lock to protect it, just call resume on each encoder and only restore the ones that are enabled.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c    | 24 ---------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h    |  6 ------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 +++++++++------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c     |  6 +++---
 5 files changed, 15 insertions(+), 49 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -14

index d8f58caf2772..9be24907f8c1 100644
@@ -841,30 +841,6 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 	return &cstate->base;
 }
 
-void dpu_crtc_runtime_resume(struct drm_crtc *crtc)
-{
-	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
-	struct drm_encoder *encoder;
-
-	mutex_lock(&dpu_crtc->crtc_lock);
-
-	if (!dpu_crtc->enabled)
-		goto end;
-
-	trace_dpu_crtc_runtime_resume(DRMID(crtc));
-
-	/* restore encoder; crtc will be programmed during commit */
-	drm_for_each_encoder(encoder, crtc->dev) {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc) · line 862

Quoted 5 lines

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5

-		if (encoder->crtc != crtc)
-			continue;
-
-		dpu_encoder_virt_restore(encoder);
-	}

I agree the patch provides a cleaner solution. Just for the understanding, won't the race condition be addressed if we acquire the modeset lock here and iterate through crtc->state->encoder_mask?

Thanks and Regards,
Jeykumar S.

Quoted 123 lines

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5

-
-end:
-	mutex_unlock(&dpu_crtc->crtc_lock);
-}
-
 static void dpu_crtc_disable(struct drm_crtc *crtc)
 {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0

 	struct dpu_crtc *dpu_crtc;

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2

index 1dca91d1210f..93d21a61a040 100644
@@ -329,10 +329,4 @@ static inline bool dpu_crtc_is_enabled(struct
 drm_crtc *crtc)
 	return crtc ? crtc->enabled : false;
 }
 
-/**
- * dpu_crtc_runtime_resume - called by the top-level on

pm_runtime_resume
- * @crtc: CRTC to resume
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2

-void dpu_crtc_runtime_resume(struct drm_crtc *crtc);
-
 #endif /* _DPU_CRTC_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -0

index 3daa86220d47..d89ac520f7e6 100644
@@ -1089,28 +1089,24 @@ static void

_dpu_encoder_virt_enable_helper(struct
drm_encoder *drm_enc)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +3 -12

 	_dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
 }
 
-void dpu_encoder_virt_restore(struct drm_encoder *drm_enc)
+void dpu_encoder_virt_runtime_resume(struct drm_encoder *drm_enc)
 {
-	struct dpu_encoder_virt *dpu_enc = NULL;
-	int i;
-
-	if (!drm_enc) {
-		DPU_ERROR("invalid encoder\n");
-		return;
-	}
-	dpu_enc = to_dpu_encoder_virt(drm_enc);
+	struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc);
 
-	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
-		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
+	mutex_lock(&dpu_enc->enc_lock);
 
-		if (phys && (phys != dpu_enc->cur_master) &&

phys->ops.restore)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +7 -2

-			phys->ops.restore(phys);
-	}
+	if (!dpu_enc->enabled)
+		goto out;
 
+	if (dpu_enc->cur_slave && dpu_enc->cur_slave->ops.restore)
+		dpu_enc->cur_slave->ops.restore(dpu_enc->cur_slave);
 	if (dpu_enc->cur_master && dpu_enc->cur_master->ops.restore)
 		dpu_enc->cur_master->ops.restore(dpu_enc->cur_master);
 
 	_dpu_encoder_virt_enable_helper(drm_enc);
+
+out:
+	mutex_unlock(&dpu_enc->enc_lock);
 }
 
 static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -1

index 9dbf38f446d9..aa4f135218fa 100644
@@ -126,10 +126,10 @@ int dpu_encoder_wait_for_event(struct drm_encoder
 *drm_encoder,
 enum dpu_intf_mode dpu_encoder_get_intf_mode(struct drm_encoder
 *encoder);
 
 /**
- * dpu_encoder_virt_restore - restore the encoder configs
+ * dpu_encoder_virt_runtime_resume - pm runtime resume the encoder

configs
* @encoder: encoder pointer
*/

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -1

-void dpu_encoder_virt_restore(struct drm_encoder *encoder);
+void dpu_encoder_virt_runtime_resume(struct drm_encoder *encoder);
 
 /**
  * dpu_encoder_init - initialize virtual encoder object

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

index e42685a1d928..c385eab7e441 100644
@@ -1132,7 +1132,7 @@ static int __maybe_unused

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1

 	int rc = -1;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dpu_kms *dpu_kms = platform_get_drvdata(pdev);
-	struct drm_crtc *crtc;
+	struct drm_encoder *encoder;
 	struct drm_device *ddev;
 	struct dss_module_power *mp = &dpu_kms->mp;

@@ -1150,8 +1150,8 @@ static int __maybe_unused

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -2

 	dpu_vbif_init_memtypes(dpu_kms);
 
-	drm_for_each_crtc(crtc, ddev)
-		dpu_crtc_runtime_resume(crtc);
+	drm_for_each_encoder(encoder, ddev)
+		dpu_encoder_virt_runtime_resume(encoder);
 
 	return rc;
 }

Signature · 1 line

Jeykumar S

From: Sean Paul <[email protected]>

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 21 ---------------------
 1 file changed, 21 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0 -21

index 0c122e173892..7ab0ba8224f6 100644
@@ -99,27 +99,6 @@ TRACE_EVENT(dpu_perf_set_ot,
 			__entry->vbif_idx)
 )
 
-TRACE_EVENT(dpu_perf_update_bus,
-	TP_PROTO(int client, unsigned long long ab_quota,
-	unsigned long long ib_quota),
-	TP_ARGS(client, ab_quota, ib_quota),
-	TP_STRUCT__entry(
-			__field(int, client)
-			__field(u64, ab_quota)
-			__field(u64, ib_quota)
-	),
-	TP_fast_assign(
-			__entry->client = client;
-			__entry->ab_quota = ab_quota;
-			__entry->ib_quota = ib_quota;
-	),
-	TP_printk("Request client:%d ab=%llu ib=%llu",
-			__entry->client,
-			__entry->ab_quota,
-			__entry->ib_quota)
-)
-
-
 TRACE_EVENT(dpu_cmd_release_bw,
 	TP_PROTO(u32 crtc_id),
 	TP_ARGS(crtc_id),

From: Sean Paul <[email protected]>

power_events are only used for pm_runtime, and that's all handled in dpu_kms. So just call vbif_init_memtypes at the correct times.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 21 +++------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h |  1 -
 2 files changed, 3 insertions(+), 19 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -4

index 23094d108e81..ae2bbaae923d 100644
@@ -651,10 +651,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms
 *dpu_kms)
 		dpu_hw_intr_destroy(dpu_kms->hw_intr);
 	dpu_kms->hw_intr = NULL;
 
-	if (dpu_kms->power_event)
-		dpu_power_handle_unregister_event(
-				&dpu_kms->phandle, dpu_kms->power_event);
-
 	/* safe to call these more than once during shutdown */
 	_dpu_debugfs_destroy(dpu_kms);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -10

 	_dpu_kms_mmu_destroy(dpu_kms);

@@ -832,16 +828,6 @@ u64 dpu_kms_get_clk_rate(struct dpu_kms *dpu_kms,
 char *clock_name)
 	return clk_get_rate(clk->clk);
 }
 
-static void dpu_kms_handle_power_event(u32 event_type, void *usr)
-{
-	struct dpu_kms *dpu_kms = usr;
-
-	if (!dpu_kms)
-		return;
-
-	dpu_vbif_init_memtypes(dpu_kms);
-}
-
 static int dpu_kms_hw_init(struct msm_kms *kms)
 {

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

 	struct dpu_kms *dpu_kms;

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -4

-	dpu_kms_handle_power_event(DPU_POWER_EVENT_ENABLE, dpu_kms);
-	dpu_kms->power_event = dpu_power_handle_register_event(
-			&dpu_kms->phandle, DPU_POWER_EVENT_ENABLE,
-			dpu_kms_handle_power_event, dpu_kms, "kms");
+	dpu_vbif_init_memtypes(dpu_kms);
 
 	pm_runtime_put_sync(&dpu_kms->pdev->dev);
 

@@ -1172,6 +1155,8 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -0

 		return rc;
 	}
 
+	dpu_vbif_init_memtypes(dpu_kms);
+
 	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -1

index f2c78deb0854..5f08be187c86 100644
@@ -114,7 +114,6 @@ struct dpu_kms {
 	struct dpu_mdss_cfg *catalog;
 
 	struct dpu_power_handle phandle;
-	struct dpu_power_event *power_event;
 
 	/* directory entry for debugfs */
 	struct dentry *debugfs_root;

From: Sean Paul <[email protected]>

power_events are only used for pm_runtime, and that's all handled in dpu_kms. So just call vbif_init_memtypes at the correct times.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 21 +++------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h |  1 -
 2 files changed, 3 insertions(+), 19 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -4

index 23094d108e81..ae2bbaae923d 100644
@@ -651,10 +651,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms
 *dpu_kms)
 		dpu_hw_intr_destroy(dpu_kms->hw_intr);
 	dpu_kms->hw_intr = NULL;
 
-	if (dpu_kms->power_event)
-		dpu_power_handle_unregister_event(
-				&dpu_kms->phandle, dpu_kms->power_event);
-
 	/* safe to call these more than once during shutdown */
 	_dpu_debugfs_destroy(dpu_kms);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -10

 	_dpu_kms_mmu_destroy(dpu_kms);

@@ -832,16 +828,6 @@ u64 dpu_kms_get_clk_rate(struct dpu_kms *dpu_kms,
 char *clock_name)
 	return clk_get_rate(clk->clk);
 }
 
-static void dpu_kms_handle_power_event(u32 event_type, void *usr)
-{
-	struct dpu_kms *dpu_kms = usr;
-
-	if (!dpu_kms)
-		return;
-
-	dpu_vbif_init_memtypes(dpu_kms);
-}
-
 static int dpu_kms_hw_init(struct msm_kms *kms)
 {

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -4

 	struct dpu_kms *dpu_kms;

@@ -1015,10 +1001,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
 	/*
 	 * Handle (re)initializations during power enable
 	 */
-	dpu_kms_handle_power_event(DPU_POWER_EVENT_ENABLE, dpu_kms);
-	dpu_kms->power_event = dpu_power_handle_register_event(
-			&dpu_kms->phandle, DPU_POWER_EVENT_ENABLE,
-			dpu_kms_handle_power_event, dpu_kms, "kms");
+	dpu_vbif_init_memtypes(dpu_kms);
 
 	pm_runtime_put_sync(&dpu_kms->pdev->dev);
 

@@ -1172,6 +1155,8 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -0

 		return rc;
 	}
 
+	dpu_vbif_init_memtypes(dpu_kms);
+
 	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -0

index f2c78deb0854..5f08be187c86 100644

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -1

-	struct dpu_power_event *power_event;
 
 	/* directory entry for debugfs */
 	struct dentry *debugfs_root;

Quoted 77 lines · Sean Paul

From: Sean Paul <[email protected]>

power_events are only used for pm_runtime, and that's all handled in dpu_kms. So just call vbif_init_memtypes at the correct times.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 21 +++------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h |  1 -
 2 files changed, 3 insertions(+), 19 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -4

index 23094d108e81..ae2bbaae923d 100644
@@ -651,10 +651,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms
 *dpu_kms)
 		dpu_hw_intr_destroy(dpu_kms->hw_intr);
 	dpu_kms->hw_intr = NULL;
 
-	if (dpu_kms->power_event)
-		dpu_power_handle_unregister_event(
-				&dpu_kms->phandle, dpu_kms->power_event);
-
 	/* safe to call these more than once during shutdown */
 	_dpu_debugfs_destroy(dpu_kms);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -10

 	_dpu_kms_mmu_destroy(dpu_kms);

@@ -832,16 +828,6 @@ u64 dpu_kms_get_clk_rate(struct dpu_kms *dpu_kms,
 char *clock_name)
 	return clk_get_rate(clk->clk);
 }
 
-static void dpu_kms_handle_power_event(u32 event_type, void *usr)
-{
-	struct dpu_kms *dpu_kms = usr;
-
-	if (!dpu_kms)
-		return;
-
-	dpu_vbif_init_memtypes(dpu_kms);
-}
-
 static int dpu_kms_hw_init(struct msm_kms *kms)
 {

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -4

 	struct dpu_kms *dpu_kms;

@@ -1015,10 +1001,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
 	/*
 	 * Handle (re)initializations during power enable
 	 */
-	dpu_kms_handle_power_event(DPU_POWER_EVENT_ENABLE, dpu_kms);
-	dpu_kms->power_event = dpu_power_handle_register_event(
-			&dpu_kms->phandle, DPU_POWER_EVENT_ENABLE,
-			dpu_kms_handle_power_event, dpu_kms, "kms");
+	dpu_vbif_init_memtypes(dpu_kms);
 
 	pm_runtime_put_sync(&dpu_kms->pdev->dev);
 

@@ -1172,6 +1155,8 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -0

 		return rc;
 	}
 
+	dpu_vbif_init_memtypes(dpu_kms);
+
 	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -0

index f2c78deb0854..5f08be187c86 100644
@@ -114,7 +114,6 @@ struct dpu_kms {
 	struct dpu_mdss_cfg *catalog;
 

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct dpu_kms { · line 116

Quoted 1 line

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -0

 	struct dpu_power_handle phandle;

You can get rid of the handle and header inclusions here itself to clean up KMS from power_handle stuff!

Quoted 5 lines

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -1

-	struct dpu_power_event *power_event;
 
 	/* directory entry for debugfs */
 	struct dentry *debugfs_root;

From: Sean Paul <[email protected]>

Instead of registering through dpu_power_handle just to get a call on runtime_resume, call the crtc function directly.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  | 23 ++++++-----------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h  | 10 ++++++----
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c   |  4 ++++
 drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h |  8 ++++----
 4 files changed, 20 insertions(+), 25 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +5 -6

index e09209d6c469..c55cb751e2b4 100644
@@ -33,7 +33,6 @@
 #include "dpu_plane.h"
 #include "dpu_encoder.h"
 #include "dpu_vbif.h"
-#include "dpu_power_handle.h"
 #include "dpu_core_perf.h"
 #include "dpu_trace.h"
 

@@ -69,8 +68,6 @@ static void dpu_crtc_destroy(struct drm_crtc *crtc)
 	if (!crtc)
 		return;
 
-	dpu_crtc->phandle = NULL;
-
 	drm_crtc_cleanup(crtc);
 	mutex_destroy(&dpu_crtc->crtc_lock);
 	kfree(dpu_crtc);

@@ -844,15 +841,17 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 	return &cstate->base;
 }
 
-static void dpu_crtc_handle_power_event(u32 event_type, void *arg)
+void dpu_crtc_runtime_resume(struct drm_crtc *crtc)
 {
-	struct drm_crtc *crtc = arg;
 	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct drm_encoder *encoder;
 
 	mutex_lock(&dpu_crtc->crtc_lock);
 
-	trace_dpu_crtc_handle_power_event(DRMID(crtc), event_type);
+	if (!dpu_crtc->enabled)
+		goto end;
+
+	trace_dpu_crtc_runtime_resume(DRMID(crtc));
 
 	/* restore encoder; crtc will be programmed during commit */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -4

 	drm_for_each_encoder(encoder, crtc->dev) {

@@ -862,6 +861,7 @@ static void dpu_crtc_handle_power_event(u32
 event_type, void *arg)
 		dpu_encoder_virt_restore(encoder);
 	}
 
+end:
 	mutex_unlock(&dpu_crtc->crtc_lock);
 }

@@ -917,10 +917,6 @@ static void dpu_crtc_disable(struct drm_crtc 
 *crtc)
 		dpu_encoder_register_frame_event_callback(encoder, NULL,
 NULL);
 	}
 
-	if (dpu_crtc->power_event)
-		dpu_power_handle_unregister_event(dpu_crtc->phandle,
-				dpu_crtc->power_event);
-
 	memset(cstate->mixers, 0, sizeof(cstate->mixers));

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5

 	cstate->num_mixers = 0;

@@ -972,11 +968,6 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
 
 	/* Enable/restore vblank irq handling */
 	drm_crtc_vblank_on(crtc);
-
-	dpu_crtc->power_event = dpu_power_handle_register_event(
-		dpu_crtc->phandle, DPU_POWER_EVENT_ENABLE,
-		dpu_crtc_handle_power_event, crtc, dpu_crtc->name);
-
 }
 
 struct plane_state {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -2

-	dpu_crtc->phandle = &kms->phandle;
-
 	DPU_DEBUG("%s: successfully initialized crtc\n", dpu_crtc->name);
 	return crtc;
 }

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -1

index 4822602402f9..1dca91d1210f 100644
@@ -151,7 +151,6 @@ struct dpu_crtc_frame_event {
  * @event_worker  : Event worker queue
  * @event_lock    : Spinlock around event handling code
  * @phandle: Pointer to power handler
- * @power_event   : registered power event handle
  * @cur_perf      : current performance committed to clock/bandwidth

driver
*/
struct dpu_crtc {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2 -3

@@ -187,9 +186,6 @@ struct dpu_crtc {
 	/* for handling internal event thread */
 	spinlock_t event_lock;
 
-	struct dpu_power_handle *phandle;
-	struct dpu_power_event *power_event;
-
 	struct dpu_core_perf_params cur_perf;
 
 	struct dpu_crtc_smmu_state_data smmu_state;

@@ -333,4 +329,10 @@ static inline bool dpu_crtc_is_enabled(struct
 drm_crtc *crtc)
 	return crtc ? crtc->enabled : false;
 }
 
+/**
+ * dpu_crtc_runtime_resume - called by the top-level on 

pm_runtime_resume
+ * @crtc: CRTC to resume
+ */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2 -0

+void dpu_crtc_runtime_resume(struct drm_crtc *crtc);
+
 #endif /* _DPU_CRTC_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

index ae2bbaae923d..62a02c606811 100644
@@ -1140,6 +1140,7 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -0

 	int rc = -1;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dpu_kms *dpu_kms = platform_get_drvdata(pdev);
+	struct drm_crtc *crtc;
 	struct drm_device *ddev;
 	struct dss_module_power *mp = &dpu_kms->mp;

@@ -1157,6 +1158,9 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -0

 	dpu_vbif_init_memtypes(dpu_kms);
 
+	drm_for_each_crtc(crtc, ddev)
+		dpu_crtc_runtime_resume(crtc);
+
 	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +4 -0

index 7ab0ba8224f6..328df37d7580 100644
@@ -298,6 +298,10 @@ DEFINE_EVENT(dpu_drm_obj_template,
 dpu_kms_wait_for_commit_done,
 	TP_PROTO(uint32_t drm_id),
 	TP_ARGS(drm_id)
 );
+DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_runtime_resume,
+	TP_PROTO(uint32_t drm_id),
+	TP_ARGS(drm_id)
+);
 
 TRACE_EVENT(dpu_enc_enable,

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0 -4

 	TP_PROTO(uint32_t drm_id, int hdisplay, int vdisplay),

@@ -518,10 +522,6 @@ DEFINE_EVENT(dpu_id_event_template,
 dpu_crtc_frame_event_cb,
 	TP_PROTO(uint32_t drm_id, u32 event),
 	TP_ARGS(drm_id, event)
 );
-DEFINE_EVENT(dpu_id_event_template, dpu_crtc_handle_power_event,
-	TP_PROTO(uint32_t drm_id, u32 event),
-	TP_ARGS(drm_id, event)
-);
 DEFINE_EVENT(dpu_id_event_template, dpu_crtc_frame_event_done,
 	TP_PROTO(uint32_t drm_id, u32 event),

TP_ARGS(drm_id, event)

Quoted 89 lines · Sean Paul

From: Sean Paul <[email protected]>

Instead of registering through dpu_power_handle just to get a call on runtime_resume, call the crtc function directly.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  | 23 ++++++-----------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h  | 10 ++++++----
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c   |  4 ++++
 drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h |  8 ++++----
 4 files changed, 20 insertions(+), 25 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +5 -6

index e09209d6c469..c55cb751e2b4 100644
@@ -33,7 +33,6 @@
 #include "dpu_plane.h"
 #include "dpu_encoder.h"
 #include "dpu_vbif.h"
-#include "dpu_power_handle.h"
 #include "dpu_core_perf.h"
 #include "dpu_trace.h"
 

@@ -69,8 +68,6 @@ static void dpu_crtc_destroy(struct drm_crtc *crtc)
 	if (!crtc)
 		return;
 
-	dpu_crtc->phandle = NULL;
-
 	drm_crtc_cleanup(crtc);
 	mutex_destroy(&dpu_crtc->crtc_lock);
 	kfree(dpu_crtc);

@@ -844,15 +841,17 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 	return &cstate->base;
 }
 
-static void dpu_crtc_handle_power_event(u32 event_type, void *arg)
+void dpu_crtc_runtime_resume(struct drm_crtc *crtc)
 {
-	struct drm_crtc *crtc = arg;
 	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct drm_encoder *encoder;
 
 	mutex_lock(&dpu_crtc->crtc_lock);
 
-	trace_dpu_crtc_handle_power_event(DRMID(crtc), event_type);
+	if (!dpu_crtc->enabled)
+		goto end;
+
+	trace_dpu_crtc_runtime_resume(DRMID(crtc));
 
 	/* restore encoder; crtc will be programmed during commit */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -9

 	drm_for_each_encoder(encoder, crtc->dev) {

@@ -862,6 +861,7 @@ static void dpu_crtc_handle_power_event(u32
 event_type, void *arg)
 		dpu_encoder_virt_restore(encoder);
 	}
 
+end:
 	mutex_unlock(&dpu_crtc->crtc_lock);
 }

@@ -917,10 +917,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
 		dpu_encoder_register_frame_event_callback(encoder, NULL,
 NULL);
 	}
 
-	if (dpu_crtc->power_event)
-		dpu_power_handle_unregister_event(dpu_crtc->phandle,
-				dpu_crtc->power_event);
-
 	memset(cstate->mixers, 0, sizeof(cstate->mixers));
 	cstate->num_mixers = 0;

@@ -972,11 +968,6 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
 
 	/* Enable/restore vblank irq handling */
 	drm_crtc_vblank_on(crtc);
-
-	dpu_crtc->power_event = dpu_power_handle_register_event(
-		dpu_crtc->phandle, DPU_POWER_EVENT_ENABLE,
-		dpu_crtc_handle_power_event, crtc, dpu_crtc->name);
-
 }
 

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c struct drm_crtc *dpu_crtc_init(struct drm_device · line 1515

Quoted 5 lines

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0

 struct plane_state {

@@ -1522,8 +1513,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device
 *dev, struct drm_plane *plane,
 	/* initialize event handling */
 	spin_lock_init(&dpu_crtc->event_lock);

If this is for synchronizing power events, we can get rid of this too.

Thanks,
Jeykumar S.

Quoted 99 lines

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -2

-	dpu_crtc->phandle = &kms->phandle;
-
 	DPU_DEBUG("%s: successfully initialized crtc\n", dpu_crtc->name);
 	return crtc;
 }

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -1

index 4822602402f9..1dca91d1210f 100644
@@ -151,7 +151,6 @@ struct dpu_crtc_frame_event {
  * @event_worker  : Event worker queue
  * @event_lock    : Spinlock around event handling code
  * @phandle: Pointer to power handler
- * @power_event   : registered power event handle
  * @cur_perf      : current performance committed to clock/bandwidth

driver
*/
struct dpu_crtc {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2 -3

@@ -187,9 +186,6 @@ struct dpu_crtc {
 	/* for handling internal event thread */
 	spinlock_t event_lock;
 
-	struct dpu_power_handle *phandle;
-	struct dpu_power_event *power_event;
-
 	struct dpu_core_perf_params cur_perf;
 
 	struct dpu_crtc_smmu_state_data smmu_state;

@@ -333,4 +329,10 @@ static inline bool dpu_crtc_is_enabled(struct
 drm_crtc *crtc)
 	return crtc ? crtc->enabled : false;
 }
 
+/**
+ * dpu_crtc_runtime_resume - called by the top-level on

pm_runtime_resume
+ * @crtc: CRTC to resume
+ */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2 -0

+void dpu_crtc_runtime_resume(struct drm_crtc *crtc);
+
 #endif /* _DPU_CRTC_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

index ae2bbaae923d..62a02c606811 100644
@@ -1140,6 +1140,7 @@ static int __maybe_unused

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -0

 	int rc = -1;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dpu_kms *dpu_kms = platform_get_drvdata(pdev);
+	struct drm_crtc *crtc;
 	struct drm_device *ddev;
 	struct dss_module_power *mp = &dpu_kms->mp;

@@ -1157,6 +1158,9 @@ static int __maybe_unused

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -0

 	dpu_vbif_init_memtypes(dpu_kms);
 
+	drm_for_each_crtc(crtc, ddev)
+		dpu_crtc_runtime_resume(crtc);
+
 	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
 	if (rc)
 		DPU_ERROR("resource enable failed: %d\n", rc);

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +4 -0

index 7ab0ba8224f6..328df37d7580 100644
@@ -298,6 +298,10 @@ DEFINE_EVENT(dpu_drm_obj_template,
 dpu_kms_wait_for_commit_done,
 	TP_PROTO(uint32_t drm_id),
 	TP_ARGS(drm_id)
 );
+DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_runtime_resume,
+	TP_PROTO(uint32_t drm_id),
+	TP_ARGS(drm_id)
+);
 
 TRACE_EVENT(dpu_enc_enable,

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0 -4

 	TP_PROTO(uint32_t drm_id, int hdisplay, int vdisplay),

@@ -518,10 +522,6 @@ DEFINE_EVENT(dpu_id_event_template,
 dpu_crtc_frame_event_cb,
 	TP_PROTO(uint32_t drm_id, u32 event),
 	TP_ARGS(drm_id, event)
 );
-DEFINE_EVENT(dpu_id_event_template, dpu_crtc_handle_power_event,
-	TP_PROTO(uint32_t drm_id, u32 event),
-	TP_ARGS(drm_id, event)
-);
 DEFINE_EVENT(dpu_id_event_template, dpu_crtc_frame_event_done,
 	TP_PROTO(uint32_t drm_id, u32 event),

TP_ARGS(drm_id, event)

Signature · 1 line

Jeykumar S

From: Sean Paul <[email protected]>

It's unused

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ---
 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 5 -----
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       | 1 -
 3 files changed, 9 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -1

index 22e84b3d7f98..ef6dd43f8bec 100644
@@ -605,7 +605,6 @@ void dpu_core_perf_destroy(struct dpu_core_perf 
 *perf)
 	dpu_core_perf_debugfs_destroy(perf);
 	perf->max_core_clk_rate = 0;
 	perf->core_clk = NULL;
-	perf->phandle = NULL;
 	perf->catalog = NULL;
 	perf->dev = NULL;

}

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -2

@@ -613,12 +612,10 @@ void dpu_core_perf_destroy(struct dpu_core_perf
 *perf)
 int dpu_core_perf_init(struct dpu_core_perf *perf,
 		struct drm_device *dev,
 		struct dpu_mdss_cfg *catalog,
-		struct dpu_power_handle *phandle,
 		struct dss_clk *core_clk)
 {
 	perf->dev = dev;
 	perf->catalog = catalog;
-	perf->phandle = phandle;
 	perf->core_clk = core_clk;
 

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -0

 	perf->max_core_clk_rate = core_clk->max_rate;

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +0 -5

index fbcbe0c7527a..68b84d85eb8f 100644
@@ -19,7 +19,6 @@
 #include <drm/drm_crtc.h>
 
 #include "dpu_hw_catalog.h"
-#include "dpu_power_handle.h"
 
 #define	DPU_PERF_DEFAULT_MAX_CORE_CLK_RATE	412500000
 

@@ -52,7 +51,6 @@ struct dpu_core_perf_tune {
  * @dev: Pointer to drm device
  * @debugfs_root: top level debug folder
  * @catalog: Pointer to catalog configuration
- * @phandle: Pointer to power handler
  * @core_clk: Pointer to core clock structure
  * @core_clk_rate: current core clock rate
  * @max_core_clk_rate: maximum allowable core clock rate

@@ -66,7 +64,6 @@ struct dpu_core_perf {
 	struct drm_device *dev;
 	struct dentry *debugfs_root;
 	struct dpu_mdss_cfg *catalog;
-	struct dpu_power_handle *phandle;
 	struct dss_clk *core_clk;
 	u64 core_clk_rate;
 	u64 max_core_clk_rate;

@@ -113,13 +110,11 @@ void dpu_core_perf_destroy(struct dpu_core_perf
 *perf);
  * @perf: Pointer to core performance context
  * @dev: Pointer to drm device
  * @catalog: Pointer to catalog
- * @phandle: Pointer to power handle
  * @core_clk: pointer to core clock
  */
 int dpu_core_perf_init(struct dpu_core_perf *perf,
 		struct drm_device *dev,
 		struct dpu_mdss_cfg *catalog,
-		struct dpu_power_handle *phandle,
 		struct dss_clk *core_clk);
 

/**

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -1

index 62a02c606811..bae7e86b2913 100644
@@ -957,7 +957,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
 	}
 
 	rc = dpu_core_perf_init(&dpu_kms->perf, dev, dpu_kms->catalog,
-			&dpu_kms->phandle,
 			_dpu_kms_get_clk(dpu_kms, "core"));
 	if (rc) {
 		DPU_ERROR("failed to init perf %d\n", rc);

From: Sean Paul <[email protected]>

It's only used in core_perf, so stick it there (and change the name to reflect that).

Signed-off-by Sean Paul <[email protected]>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 34 +++++++++----------
 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 17 ++++++++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c      |  4 +--
 .../gpu/drm/msm/disp/dpu1/dpu_power_handle.h  | 13 -------
 4 files changed, 34 insertions(+), 34 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +3 -3

index ef6dd43f8bec..bffc51e496e7 100644
@@ -95,20 +95,20 @@ static void _dpu_core_perf_calc_crtc(struct dpu_kms
 *kms,
 	memset(perf, 0, sizeof(struct dpu_core_perf_params));
 
 	if (!dpu_cstate->bw_control) {
-		for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+		for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 			perf->bw_ctl[i] = kms->catalog->perf.max_bw_high *
 					1000ULL;
 			perf->max_per_pipe_ib[i] = perf->bw_ctl[i];
 		}
 		perf->core_clk_rate = kms->perf.max_core_clk_rate;
 	} else if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM) {
-		for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+		for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 			perf->bw_ctl[i] = 0;
 			perf->max_per_pipe_ib[i] = 0;
 		}
 		perf->core_clk_rate = 0;
 	} else if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED) {
-		for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+		for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 			perf->bw_ctl[i] = kms->perf.fix_core_ab_vote;
 			perf->max_per_pipe_ib[i] =

kms->perf.fix_core_ib_vote;

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -0

 		}

@@ -118,12 +118,12 @@ static void _dpu_core_perf_calc_crtc(struct 

dpu_kms
*kms,

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -0

 	DPU_DEBUG(
 		"crtc=%d clk_rate=%llu core_ib=%llu core_ab=%llu

llcc_ib=%llu llcc_ab=%llu mem_ib=%llu mem_ab=%llu\n",

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -1

 			crtc->base.id, perf->core_clk_rate,
-

perf->max_per_pipe_ib[DPU_POWER_HANDLE_DBUS_ID_MNOC],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -2

-			perf->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_MNOC],
-

perf->max_per_pipe_ib[DPU_POWER_HANDLE_DBUS_ID_LLCC],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -2

-			perf->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_LLCC],
-

perf->max_per_pipe_ib[DPU_POWER_HANDLE_DBUS_ID_EBI],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1 -1

-			perf->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_EBI]);
+

perf->max_per_pipe_ib[DPU_CORE_PERF_DATA_BUS_ID_MNOC],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +2 -0

+			perf->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_MNOC],
+

perf->max_per_pipe_ib[DPU_CORE_PERF_DATA_BUS_ID_LLCC],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +2 -0

+			perf->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_LLCC],
+

perf->max_per_pipe_ib[DPU_CORE_PERF_DATA_BUS_ID_EBI],

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +4 -3

+			perf->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_EBI]);
 }
 
 int dpu_core_perf_crtc_check(struct drm_crtc *crtc,

@@ -158,8 +158,8 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc,
 	/* obtain new values */
 	_dpu_core_perf_calc_crtc(kms, crtc, state, &dpu_cstate->new_perf);
 
-	for (i = DPU_POWER_HANDLE_DBUS_ID_MNOC;
-			i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+	for (i = DPU_CORE_PERF_DATA_BUS_ID_MNOC;
+			i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 		bw_sum_of_intfs = dpu_cstate->new_perf.bw_ctl[i];
 		curr_client_type = dpu_crtc_get_client_type(crtc);
 

@@ -290,7 +290,7 @@ void dpu_core_perf_crtc_release_bw(struct drm_crtc
 *crtc)
 	if (kms->perf.enable_bw_release) {
 		trace_dpu_cmd_release_bw(crtc->base.id);
 		DPU_DEBUG("Release BW crtc=%d\n", crtc->base.id);
-		for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+		for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 			dpu_crtc->cur_perf.bw_ctl[i] = 0;
 			_dpu_core_perf_crtc_update_bus(kms, crtc, i);

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1 -1

 		}

@@ -367,7 +367,7 @@ int dpu_core_perf_crtc_update(struct drm_crtc 
 *crtc,
 	new = &dpu_cstate->new_perf;
 
 	if (_dpu_core_perf_crtc_is_power_on(crtc) && !stop_req) {
-		for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+		for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 			/*
 			 * cases for bus bandwidth update.

* 1. new bandwidth vote - "ab or ib vote" is
higher

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +3 -3

@@ -409,13 +409,13 @@ int dpu_core_perf_crtc_update(struct drm_crtc 
 *crtc,
 		update_clk = 1;
 	}
 	trace_dpu_perf_crtc_update(crtc->base.id,
-
 new->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_MNOC],
-
 new->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_LLCC],
-				new->bw_ctl[DPU_POWER_HANDLE_DBUS_ID_EBI],
+
 new->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_MNOC],
+
 new->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_LLCC],
+
 new->bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_EBI],
 				new->core_clk_rate, stop_req,

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1 -1

 				update_bus, update_clk);
 
-	for (i = 0; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+	for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 		if (update_bus & BIT(i)) {
 			ret = _dpu_core_perf_crtc_update_bus(kms, crtc,

i);

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0 -0

 			if (ret) {

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +15 -2

index 68b84d85eb8f..c708451a94a1 100644
@@ -22,6 +22,19 @@
 
 #define	DPU_PERF_DEFAULT_MAX_CORE_CLK_RATE	412500000
 
+/**
+ * enum dpu_core_perf_data_bus_id - data bus identifier
+ * @DPU_CORE_PERF_DATA_BUS_ID_MNOC: DPU/MNOC data bus
+ * @DPU_CORE_PERF_DATA_BUS_ID_LLCC: MNOC/LLCC data bus
+ * @DPU_CORE_PERF_DATA_BUS_ID_EBI: LLCC/EBI data bus
+ */
+enum dpu_core_perf_data_bus_id {
+	DPU_CORE_PERF_DATA_BUS_ID_MNOC,
+	DPU_CORE_PERF_DATA_BUS_ID_LLCC,
+	DPU_CORE_PERF_DATA_BUS_ID_EBI,
+	DPU_CORE_PERF_DATA_BUS_ID_MAX,
+};
+
 /**
  * struct dpu_core_perf_params - definition of performance parameters
  * @max_per_pipe_ib: maximum instantaneous bandwidth request

@@ -29,8 +42,8 @@
  * @core_clk_rate: core clock rate request
  */
 struct dpu_core_perf_params {
-	u64 max_per_pipe_ib[DPU_POWER_HANDLE_DBUS_ID_MAX];
-	u64 bw_ctl[DPU_POWER_HANDLE_DBUS_ID_MAX];
+	u64 max_per_pipe_ib[DPU_CORE_PERF_DATA_BUS_ID_MAX];
+	u64 bw_ctl[DPU_CORE_PERF_DATA_BUS_ID_MAX];
 	u64 core_clk_rate;
 };
 

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -2

index c55cb751e2b4..d8f58caf2772 100644
@@ -1370,8 +1370,8 @@ static int dpu_crtc_debugfs_state_show(struct
 seq_file *s, void *v)
 	seq_printf(s, "intf_mode: %d\n", dpu_crtc_get_intf_mode(crtc));
 	seq_printf(s, "core_clk_rate: %llu\n",
 			dpu_crtc->cur_perf.core_clk_rate);
-	for (i = DPU_POWER_HANDLE_DBUS_ID_MNOC;
-			i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) {
+	for (i = DPU_CORE_PERF_DATA_BUS_ID_MNOC;
+			i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
 		seq_printf(s, "bw_ctl[%d]: %llu\n", i,
 				dpu_crtc->cur_perf.bw_ctl[i]);

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0

 		seq_printf(s, "max_per_pipe_ib[%d]: %llu\n", i,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +0 -13

index 124ebc93c877..7536624c8b20 100644
@@ -27,19 +27,6 @@
 #define DPU_POWER_EVENT_DISABLE	BIT(0)
 #define DPU_POWER_EVENT_ENABLE	BIT(1)
 
-/**
- * enum DPU_POWER_HANDLE_DBUS_ID - data bus identifier
- * @DPU_POWER_HANDLE_DBUS_ID_MNOC: DPU/MNOC data bus
- * @DPU_POWER_HANDLE_DBUS_ID_LLCC: MNOC/LLCC data bus
- * @DPU_POWER_HANDLE_DBUS_ID_EBI: LLCC/EBI data bus
- */
-enum DPU_POWER_HANDLE_DBUS_ID {
-	DPU_POWER_HANDLE_DBUS_ID_MNOC,
-	DPU_POWER_HANDLE_DBUS_ID_LLCC,
-	DPU_POWER_HANDLE_DBUS_ID_EBI,
-	DPU_POWER_HANDLE_DBUS_ID_MAX,
-};
-
 /*
  * struct dpu_power_event - local event registration structure
  * @client_name: name of the client registering

From: Sean Paul <[email protected]>

Now that we don't have any event handlers, remove dpu_power_handle!

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/Makefile                  |   1 -
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       |  11 --
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h       |   3 -
 .../gpu/drm/msm/disp/dpu1/dpu_power_handle.c  | 136 ------------------
 .../gpu/drm/msm/disp/dpu1/dpu_power_handle.h  | 113 ---------------
 5 files changed, 264 deletions(-)
 delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c
 delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h

drivers/gpu/drm/msm/Makefile +0 -1

index 19ab521d4c3a..7d02ef3655b5 100644
@@ -72,7 +72,6 @@ msm-y := \
 	disp/dpu1/dpu_kms.o \
 	disp/dpu1/dpu_mdss.o \
 	disp/dpu1/dpu_plane.o \
-	disp/dpu1/dpu_power_handle.o \
 	disp/dpu1/dpu_rm.o \
 	disp/dpu1/dpu_vbif.o \
 	msm_atomic.o \

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -2

index bae7e86b2913..e42685a1d928 100644
@@ -1063,8 +1063,6 @@ static int dpu_bind(struct device *dev, struct
 device *master, void *data)
 		return ret;
 	}
 
-	dpu_power_resource_init(pdev, &dpu_kms->phandle);
-
 	platform_set_drvdata(pdev, dpu_kms);
 

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -1

 	msm_kms_init(&dpu_kms->base, &kms_funcs);

@@ -1084,7 +1082,6 @@ static void dpu_unbind(struct device *dev, struct
 device *master, void *data)
 	struct dpu_kms *dpu_kms = platform_get_drvdata(pdev);
 	struct dss_module_power *mp = &dpu_kms->mp;
 
-	dpu_power_resource_deinit(pdev, &dpu_kms->phandle);
 	msm_dss_put_clk(mp->clk_config, mp->num_clk);
 	devm_kfree(&pdev->dev, mp->clk_config);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -4

 	mp->num_clk = 0;

@@ -1123,10 +1120,6 @@ static int __maybe_unused
 dpu_runtime_suspend(struct device *dev)
 		return rc;
 	}
 
-	rc = dpu_power_resource_enable(&dpu_kms->phandle, false);
-	if (rc)
-		DPU_ERROR("resource disable failed: %d\n", rc);
-
 	rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, false);
 	if (rc)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -0

 		DPU_ERROR("clock disable failed rc:%d\n", rc);

@@ -1160,10 +1153,6 @@ static int __maybe_unused 

dpu_runtime_resume(struct
device *dev)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -4

 	drm_for_each_crtc(crtc, ddev)
 		dpu_crtc_runtime_resume(crtc);
 
-	rc = dpu_power_resource_enable(&dpu_kms->phandle, true);
-	if (rc)
-		DPU_ERROR("resource enable failed: %d\n", rc);
-
 	return rc;
 }

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -3

index 4e5acacb3065..59e18e2d3c59 100644
@@ -31,7 +31,6 @@
 #include "dpu_hw_top.h"
 #include "dpu_io_util.h"
 #include "dpu_rm.h"
-#include "dpu_power_handle.h"
 #include "dpu_irq.h"
 #include "dpu_core_perf.h"
 

@@ -114,8 +113,6 @@ struct dpu_kms {
 	int core_rev;
 	struct dpu_mdss_cfg *catalog;
 
-	struct dpu_power_handle phandle;
-
 	/* directory entry for debugfs */
 	struct dentry *debugfs_root;
 	struct dentry *debugfs_danger;

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c deleted +0 -3

deleted file mode 100644
index 8e64f0a52147..000000000000
@@ -1,136 +0,0 @@
-/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or 

modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c deleted +0 -15

-
-#define pr_fmt(fmt)	"[drm:%s:%d]: " fmt, __func__, __LINE__
-
-#include <linux/kernel.h>
-#include <linux/of.h>
-#include <linux/string.h>
-#include <linux/of_address.h>
-#include <linux/slab.h>
-#include <linux/mutex.h>
-#include <linux/of_platform.h>
-
-#include "dpu_power_handle.h"
-#include "dpu_trace.h"
-
-static void dpu_power_event_trigger_locked(struct dpu_power_handle

*phandle,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c deleted +0 -43

-		u32 event_type)
-{
-	struct dpu_power_event *event;
-
-	list_for_each_entry(event, &phandle->event_list, list) {
-		if (event->event_type & event_type)
-			event->cb_fnc(event_type, event->usr);
-	}
-}
-
-void dpu_power_resource_init(struct platform_device *pdev,
-	struct dpu_power_handle *phandle)
-{
-	phandle->dev = &pdev->dev;
-
-	INIT_LIST_HEAD(&phandle->event_list);
-
-	mutex_init(&phandle->phandle_lock);
-}
-
-void dpu_power_resource_deinit(struct platform_device *pdev,
-	struct dpu_power_handle *phandle)
-{
-	struct dpu_power_event *curr_event, *next_event;
-
-	if (!phandle || !pdev) {
-		pr_err("invalid input param\n");
-		return;
-	}
-
-	mutex_lock(&phandle->phandle_lock);
-	list_for_each_entry_safe(curr_event, next_event,
-			&phandle->event_list, list) {
-		pr_err("event:%d, client:%s still registered\n",
-				curr_event->event_type,
-				curr_event->client_name);
-		curr_event->active = false;
-		list_del(&curr_event->list);
-	}
-	mutex_unlock(&phandle->phandle_lock);
-}
-
-int dpu_power_resource_enable(struct dpu_power_handle *phandle, bool

enable)

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c deleted +0 -11

-{
-	u32 event_type;
-
-	if (!phandle) {
-		pr_err("invalid input argument\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&phandle->phandle_lock);
-
-	event_type = enable ? DPU_POWER_EVENT_ENABLE :

DPU_POWER_EVENT_DISABLE;

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c deleted +0 -55

-
-	dpu_power_event_trigger_locked(phandle,	event_type);
-
-	mutex_unlock(&phandle->phandle_lock);
-	return 0;
-}
-
-struct dpu_power_event *dpu_power_handle_register_event(
-		struct dpu_power_handle *phandle,
-		u32 event_type, void (*cb_fnc)(u32 event_type, void *usr),
-		void *usr, char *client_name)
-{
-	struct dpu_power_event *event;
-
-	if (!phandle) {
-		pr_err("invalid power handle\n");
-		return ERR_PTR(-EINVAL);
-	} else if (!cb_fnc || !event_type) {
-		pr_err("no callback fnc or event type\n");
-		return ERR_PTR(-EINVAL);
-	}
-
-	event = kzalloc(sizeof(struct dpu_power_event), GFP_KERNEL);
-	if (!event)
-		return ERR_PTR(-ENOMEM);
-
-	event->event_type = event_type;
-	event->cb_fnc = cb_fnc;
-	event->usr = usr;
-	strlcpy(event->client_name, client_name, MAX_CLIENT_NAME_LEN);
-	event->active = true;
-
-	mutex_lock(&phandle->phandle_lock);
-	list_add(&event->list, &phandle->event_list);
-	mutex_unlock(&phandle->phandle_lock);
-
-	return event;
-}
-
-void dpu_power_handle_unregister_event(
-		struct dpu_power_handle *phandle,
-		struct dpu_power_event *event)
-{
-	if (!phandle || !event) {
-		pr_err("invalid phandle or event\n");
-	} else if (!event->active) {
-		pr_err("power handle deinit already done\n");
-		kfree(event);
-	} else {
-		mutex_lock(&phandle->phandle_lock);
-		list_del_init(&event->list);
-		mutex_unlock(&phandle->phandle_lock);
-		kfree(event);
-	}
-}

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h deleted +0 -3

deleted file mode 100644
index 7536624c8b20..000000000000
@@ -1,113 +0,0 @@
-/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or 

modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h deleted +0 -75

-
-#ifndef _DPU_POWER_HANDLE_H_
-#define _DPU_POWER_HANDLE_H_
-
-#define MAX_CLIENT_NAME_LEN 128
-
-#define DPU_POWER_HANDLE_ENABLE_BUS_AB_QUOTA	0
-#define DPU_POWER_HANDLE_DISABLE_BUS_AB_QUOTA	0
-#define DPU_POWER_HANDLE_ENABLE_BUS_IB_QUOTA	1600000000
-#define DPU_POWER_HANDLE_DISABLE_BUS_IB_QUOTA	0
-
-#include "dpu_io_util.h"
-
-/* events will be triggered on power handler enable/disable */
-#define DPU_POWER_EVENT_DISABLE	BIT(0)
-#define DPU_POWER_EVENT_ENABLE	BIT(1)
-
-/*
- * struct dpu_power_event - local event registration structure
- * @client_name: name of the client registering
- * @cb_fnc: pointer to desired callback function
- * @usr: user pointer to pass to callback event trigger
- * @event: refer to DPU_POWER_HANDLE_EVENT_*
- * @list: list to attach event master list
- * @active: indicates the state of dpu power handle
- */
-struct dpu_power_event {
-	char client_name[MAX_CLIENT_NAME_LEN];
-	void (*cb_fnc)(u32 event_type, void *usr);
-	void *usr;
-	u32 event_type;
-	struct list_head list;
-	bool active;
-};
-
-/**
- * struct dpu_power_handle: power handle main struct
- * @phandle_lock: lock to synchronize the enable/disable
- * @dev: pointer to device structure
- * @usecase_ndx: current usecase index
- * @event_list: current power handle event list
- */
-struct dpu_power_handle {
-	struct mutex phandle_lock;
-	struct device *dev;
-	u32 current_usecase_ndx;
-	struct list_head event_list;
-};
-
-/**
- * dpu_power_resource_init() - initializes the dpu power handle
- * @pdev:   platform device to search the power resources
- * @pdata:  power handle to store the power resources
- */
-void dpu_power_resource_init(struct platform_device *pdev,
-	struct dpu_power_handle *pdata);
-
-/**
- * dpu_power_resource_deinit() - release the dpu power handle
- * @pdev:   platform device for power resources
- * @pdata:  power handle containing the resources
- *
- * Return: error code.
- */
-void dpu_power_resource_deinit(struct platform_device *pdev,
-	struct dpu_power_handle *pdata);
-
-/**
- * dpu_power_resource_enable() - enable/disable the power resources
- * @pdata:  power handle containing the resources
- * @enable: boolean request for enable/disable
- *
- * Return: error code.
- */
-int dpu_power_resource_enable(struct dpu_power_handle *pdata, bool

enable);

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h deleted +0 -3

-
-/**
- * dpu_power_handle_register_event - register a callback function for 

an
event.
- * Clients can register for multiple events with a single register.
- * Any block with access to phandle can register for the event
- * notification.
- * @phandle: power handle containing the resources
- * @event_type: event type to register; refer
DPU_POWER_HANDLE_EVENT_*
- * @cb_fnc: pointer to desired callback function
- * @usr: user pointer to pass to callback on event trigger
- *
- * Return: event pointer if success, or error code otherwise
- */

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h deleted +0 -6

-struct dpu_power_event *dpu_power_handle_register_event(
-		struct dpu_power_handle *phandle,
-		u32 event_type, void (*cb_fnc)(u32 event_type, void *usr),
-		void *usr, char *client_name);
-/**
- * dpu_power_handle_unregister_event - unregister callback for 

event(s)
- * @phandle: power handle containing the resources
- * @event: event pointer returned after power handle register
- */
-void dpu_power_handle_unregister_event(struct dpu_power_handle *phandle,

drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h deleted +0 -3

-		struct dpu_power_event *event);
-
-#endif /* _DPU_POWER_HANDLE_H_ */

From: Sean Paul <[email protected]>

Add a bool to dpu_encoder_virt to track whether the encoder is enabled or not. Repurpose the enc_lock mutex to ensure that it is consistent with the hw state.

Signed-off-by Sean Paul <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -0

index 10a0676d1dcf..3daa86220d47 100644
@@ -132,6 +132,7 @@ enum dpu_enc_rc_states {
  * @base:		drm_encoder base class for registration with DRM
  * @enc_spinlock:	Virtual-Encoder-Wide Spin Lock for IRQ purposes
  * @bus_scaling_client:	Client handle to the bus scaling interface
+ * @enabled:		True if the encoder is active, protected by

enc_lock
* @num_phys_encs: Actual number of physical encoders contained.
* @phys_encs: Container of physical encoders managed.
* @cur_master: Pointer to the current master in this
mode. Optimization

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -1

@@ -148,8 +149,8 @@ enum dpu_enc_rc_states {
  *				all CTL paths
  * @crtc_kickoff_cb_data:	Opaque user data given to crtc_kickoff_cb
  * @debugfs_root:		Debug file system root file node
- * @enc_lock:			Lock around physical encoder

create/destroy and

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -1

-				access.
+ * @enc_lock:			Lock around physical encoder
+ *				create/destroy/enable/disable
  * @frame_busy_mask:		Bitmask tracking which phys_enc we are

still
* busy processing current command.
* Bit0 = phys_encs[0] etc.

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +4 -0

@@ -175,6 +176,8 @@ struct dpu_encoder_virt {
 	spinlock_t enc_spinlock;
 	uint32_t bus_scaling_client;
 
+	bool enabled;
+
 	unsigned int num_phys_encs;
 	struct dpu_encoder_phys *phys_encs[MAX_PHYS_ENCODERS_PER_VIRTUAL];
 	struct dpu_encoder_phys *cur_master;

@@ -1121,6 +1124,8 @@ static void dpu_encoder_virt_enable(struct
 drm_encoder *drm_enc)
 		return;
 	}
 	dpu_enc = to_dpu_encoder_virt(drm_enc);
+
+	mutex_lock(&dpu_enc->enc_lock);
 	cur_mode = &dpu_enc->base.crtc->state->adjusted_mode;
 

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +6 -1

 	trace_dpu_enc_enable(DRMID(drm_enc), cur_mode->hdisplay,

@@ -1137,10 +1142,15 @@ static void dpu_encoder_virt_enable(struct
 drm_encoder *drm_enc)
 	if (ret) {
 		DPU_ERROR_ENC(dpu_enc, "dpu resource control failed:
 %d\n",
 				ret);
-		return;
+		goto out;
 	}
 
 	_dpu_encoder_virt_enable_helper(drm_enc);
+
+	dpu_enc->enabled = true;
+
+out:
+	mutex_unlock(&dpu_enc->enc_lock);
 }

static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)