Commit 88b0f5a5 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm/dpu: remove unused dpu_hw_blk features 



Remove all unused dpu_hw_blk features and functions:
- dpu_hw_blk_get()/_put() and respective refcounting,
- global list of all dpu_hw_blk instances,
- dpu_hw_blk_ops and empty implementation inside each hw_blk subdriver.

This leaves dpu_hw_blk as a placeholder with just type and index.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210515190909.1809050-2-dmitry.baryshkov@linaro.org


Reviewed-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 299b809e

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c

+1 −103
Original line number Diff line number Diff line
@@ -11,33 +11,16 @@ 
#include "dpu_hw_mdss.h"

#include "dpu_hw_blk.h"



/* Serialization lock for dpu_hw_blk_list */

static DEFINE_MUTEX(dpu_hw_blk_lock);



/* List of all hw block objects */

static LIST_HEAD(dpu_hw_blk_list);



/**

 * dpu_hw_blk_init - initialize hw block object

 * @hw_blk: pointer to hw block object

 * @type: hw block type - enum dpu_hw_blk_type

 * @id: instance id of the hw block

 * @ops: Pointer to block operations

 */

void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

		struct dpu_hw_blk_ops *ops)

void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id)

{

	INIT_LIST_HEAD(&hw_blk->list);

	hw_blk->type = type;

	hw_blk->id = id;

	atomic_set(&hw_blk->refcount, 0);



	if (ops)

		hw_blk->ops = *ops;



	mutex_lock(&dpu_hw_blk_lock);

	list_add(&hw_blk->list, &dpu_hw_blk_list);

	mutex_unlock(&dpu_hw_blk_lock);

}



/**
@@ -51,89 +34,4 @@ void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk) 
		pr_err("invalid parameters\n");

		return;

	}



	if (atomic_read(&hw_blk->refcount))

		pr_err("hw_blk:%d.%d invalid refcount\n", hw_blk->type,

				hw_blk->id);



	mutex_lock(&dpu_hw_blk_lock);

	list_del(&hw_blk->list);

	mutex_unlock(&dpu_hw_blk_lock);

}



/**

 * dpu_hw_blk_get - get hw_blk from free pool

 * @hw_blk: if specified, increment reference count only

 * @type: if hw_blk is not specified, allocate the next available of this type

 * @id: if specified (>= 0), allocate the given instance of the above type

 * return: pointer to hw block object

 */

struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, int id)

{

	struct dpu_hw_blk *curr;

	int rc, refcount;



	if (!hw_blk) {

		mutex_lock(&dpu_hw_blk_lock);

		list_for_each_entry(curr, &dpu_hw_blk_list, list) {

			if ((curr->type != type) ||

					(id >= 0 && curr->id != id) ||

					(id < 0 &&

						atomic_read(&curr->refcount)))

				continue;



			hw_blk = curr;

			break;

		}

		mutex_unlock(&dpu_hw_blk_lock);

	}



	if (!hw_blk) {

		pr_debug("no hw_blk:%d\n", type);

		return NULL;

	}



	refcount = atomic_inc_return(&hw_blk->refcount);



	if (refcount == 1 && hw_blk->ops.start) {

		rc = hw_blk->ops.start(hw_blk);

		if (rc) {

			pr_err("failed to start  hw_blk:%d rc:%d\n", type, rc);

			goto error_start;

		}

	}



	pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type,

			hw_blk->id, refcount);

	return hw_blk;



error_start:

	dpu_hw_blk_put(hw_blk);

	return ERR_PTR(rc);

}



/**

 * dpu_hw_blk_put - put hw_blk to free pool if decremented refcount is zero

 * @hw_blk: hw block to be freed

 */

void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk)

{

	if (!hw_blk) {

		pr_err("invalid parameters\n");

		return;

	}



	pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type, hw_blk->id,

			atomic_read(&hw_blk->refcount));



	if (!atomic_read(&hw_blk->refcount)) {

		pr_err("hw_blk:%d.%d invalid put\n", hw_blk->type, hw_blk->id);

		return;

	}



	if (atomic_dec_return(&hw_blk->refcount))

		return;



	if (hw_blk->ops.stop)

		hw_blk->ops.stop(hw_blk);

}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h

+1 −18
Original line number Diff line number Diff line
@@ -7,19 +7,9 @@ 


#include <linux/types.h>

#include <linux/list.h>

#include <linux/atomic.h>



struct dpu_hw_blk;



/**

 * struct dpu_hw_blk_ops - common hardware block operations

 * @start: start operation on first get

 * @stop: stop operation on last put

 */

struct dpu_hw_blk_ops {

	int (*start)(struct dpu_hw_blk *);

	void (*stop)(struct dpu_hw_blk *);

};



/**

 * struct dpu_hw_blk - definition of hardware block object
@@ -29,17 +19,10 @@ struct dpu_hw_blk_ops { 
 * @refcount: reference/usage count

 */

struct dpu_hw_blk {

	struct list_head list;

	u32 type;

	int id;

	atomic_t refcount;

	struct dpu_hw_blk_ops ops;

};



void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

		struct dpu_hw_blk_ops *ops);

void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id);

void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk);



struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, int id);

void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk);

#endif /*_DPU_HW_BLK_H */

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c

+1 −3
Original line number Diff line number Diff line
@@ -589,8 +589,6 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, 
		ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active;

};



static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx,

		void __iomem *addr,

		const struct dpu_mdss_cfg *m)
@@ -615,7 +613,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, 
	c->mixer_count = m->mixer_count;

	c->mixer_hw_caps = m->mixer;



	dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx, &dpu_hw_ops);

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx);



	return c;

}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c

+1 −3
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp, 
	return ERR_PTR(-EINVAL);

}



static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx,

			void __iomem *addr,

			const struct dpu_mdss_cfg *m)
@@ -112,7 +110,7 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, 
	c->cap = cfg;

	_setup_dspp_ops(c, c->cap->features);



	dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx, &dpu_hw_ops);

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx);



	return c;

}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c

+1 −3
Original line number Diff line number Diff line
@@ -299,8 +299,6 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops *ops, 
		ops->bind_pingpong_blk = dpu_hw_intf_bind_pingpong_blk;

}



static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx,

		void __iomem *addr,

		const struct dpu_mdss_cfg *m)
@@ -327,7 +325,7 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, 
	c->mdss = m;

	_setup_intf_ops(&c->ops, c->cap->features);



	dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx, &dpu_hw_ops);

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx);



	return c;

}