Skip to content

L
linux
Commit 726bcbb7 authored by Jeykumar Sankaran's avatar Jeykumar Sankaran Committed by Rob Clark
Browse files
Options

drm/msm/dpu: remove resource pool manager 

resource pool manager utility was introduced to manage
rotator sessions. Removing the support as the rotator
feature doesn't exist.

changes in v4:
	- none
changes in v5:
	- none
Signed-off-by: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent a9a0a61a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 261 deletions
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
View file @ 726bcbb7
......@@ -97,187 +97,6 @@ static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool enable)
return 0;
}
/**
* _dpu_crtc_rp_to_crtc - get crtc from resource pool object
* @rp: Pointer to resource pool
* return: Pointer to drm crtc if success; null otherwise
*/
static struct drm_crtc *_dpu_crtc_rp_to_crtc(struct dpu_crtc_respool *rp)
{
if (!rp)
return NULL;
return container_of(rp, struct dpu_crtc_state, rp)->base.crtc;
}
/**
* _dpu_crtc_rp_reclaim - reclaim unused, or all if forced, resources in pool
* @rp: Pointer to resource pool
* @force: True to reclaim all resources; otherwise, reclaim only unused ones
* return: None
*/
static void _dpu_crtc_rp_reclaim(struct dpu_crtc_respool *rp, bool force)
{
struct dpu_crtc_res *res, *next;
struct drm_crtc *crtc;
crtc = _dpu_crtc_rp_to_crtc(rp);
if (!crtc) {
DPU_ERROR("invalid crtc\n");
return;
}
DPU_DEBUG("crtc%d.%u %s\n", crtc->base.id, rp->sequence_id,
force ? "destroy" : "free_unused");
list_for_each_entry_safe(res, next, &rp->res_list, list) {
if (!force && !(res->flags & DPU_CRTC_RES_FLAG_FREE))
continue;
DPU_DEBUG("crtc%d.%u reclaim res:0x%x/0x%llx/%pK/%d\n",
crtc->base.id, rp->sequence_id,
res->type, res->tag, res->val,
atomic_read(&res->refcount));
list_del(&res->list);
if (res->ops.put)
res->ops.put(res->val);
kfree(res);
}
}
/**
* _dpu_crtc_rp_free_unused - free unused resource in pool
* @rp: Pointer to resource pool
* return: none
*/
static void _dpu_crtc_rp_free_unused(struct dpu_crtc_respool *rp)
{
mutex_lock(rp->rp_lock);
_dpu_crtc_rp_reclaim(rp, false);
mutex_unlock(rp->rp_lock);
}
/**
* _dpu_crtc_rp_destroy - destroy resource pool
* @rp: Pointer to resource pool
* return: None
*/
static void _dpu_crtc_rp_destroy(struct dpu_crtc_respool *rp)
{
mutex_lock(rp->rp_lock);
list_del_init(&rp->rp_list);
_dpu_crtc_rp_reclaim(rp, true);
mutex_unlock(rp->rp_lock);
}
/**
* _dpu_crtc_hw_blk_get - get callback for hardware block
* @val: Resource handle
* @type: Resource type
* @tag: Search tag for given resource
* return: Resource handle
*/
static void *_dpu_crtc_hw_blk_get(void *val, u32 type, u64 tag)
{
DPU_DEBUG("res:%d/0x%llx/%pK\n", type, tag, val);
return dpu_hw_blk_get(val, type, tag);
}
/**
* _dpu_crtc_hw_blk_put - put callback for hardware block
* @val: Resource handle
* return: None
*/
static void _dpu_crtc_hw_blk_put(void *val)
{
DPU_DEBUG("res://%pK\n", val);
dpu_hw_blk_put(val);
}
/**
* _dpu_crtc_rp_duplicate - duplicate resource pool and reset reference count
* @rp: Pointer to original resource pool
* @dup_rp: Pointer to duplicated resource pool
* return: None
*/
static void _dpu_crtc_rp_duplicate(struct dpu_crtc_respool *rp,
struct dpu_crtc_respool *dup_rp)
{
struct dpu_crtc_res *res, *dup_res;
struct drm_crtc *crtc;
if (!rp || !dup_rp || !rp->rp_head) {
DPU_ERROR("invalid resource pool\n");
return;
}
crtc = _dpu_crtc_rp_to_crtc(rp);
if (!crtc) {
DPU_ERROR("invalid crtc\n");
return;
}
DPU_DEBUG("crtc%d.%u duplicate\n", crtc->base.id, rp->sequence_id);
mutex_lock(rp->rp_lock);
dup_rp->sequence_id = rp->sequence_id + 1;
INIT_LIST_HEAD(&dup_rp->res_list);
dup_rp->ops = rp->ops;
list_for_each_entry(res, &rp->res_list, list) {
dup_res = kzalloc(sizeof(struct dpu_crtc_res), GFP_KERNEL);
if (!dup_res) {
mutex_unlock(rp->rp_lock);
return;
}
INIT_LIST_HEAD(&dup_res->list);
atomic_set(&dup_res->refcount, 0);
dup_res->type = res->type;
dup_res->tag = res->tag;
dup_res->val = res->val;
dup_res->ops = res->ops;
dup_res->flags = DPU_CRTC_RES_FLAG_FREE;
DPU_DEBUG("crtc%d.%u dup res:0x%x/0x%llx/%pK/%d\n",
crtc->base.id, dup_rp->sequence_id,
dup_res->type, dup_res->tag, dup_res->val,
atomic_read(&dup_res->refcount));
list_add_tail(&dup_res->list, &dup_rp->res_list);
if (dup_res->ops.get)
dup_res->ops.get(dup_res->val, 0, -1);
}
dup_rp->rp_lock = rp->rp_lock;
dup_rp->rp_head = rp->rp_head;
INIT_LIST_HEAD(&dup_rp->rp_list);
list_add_tail(&dup_rp->rp_list, rp->rp_head);
mutex_unlock(rp->rp_lock);
}
/**
* _dpu_crtc_rp_reset - reset resource pool after allocation
* @rp: Pointer to original resource pool
* @rp_lock: Pointer to serialization resource pool lock
* @rp_head: Pointer to crtc resource pool head
* return: None
*/
static void _dpu_crtc_rp_reset(struct dpu_crtc_respool *rp,
struct mutex *rp_lock, struct list_head *rp_head)
{
if (!rp || !rp_lock || !rp_head) {
DPU_ERROR("invalid resource pool\n");
return;
}
mutex_lock(rp_lock);
rp->rp_lock = rp_lock;
rp->rp_head = rp_head;
INIT_LIST_HEAD(&rp->rp_list);
rp->sequence_id = 0;
INIT_LIST_HEAD(&rp->res_list);
rp->ops.get = _dpu_crtc_hw_blk_get;
rp->ops.put = _dpu_crtc_hw_blk_put;
list_add_tail(&rp->rp_list, rp->rp_head);
mutex_unlock(rp_lock);
}
static void dpu_crtc_destroy(struct drm_crtc *crtc)
{
struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
......@@ -965,8 +784,6 @@ static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
DPU_DEBUG("crtc%d\n", crtc->base.id);
_dpu_crtc_rp_destroy(&cstate->rp);
__drm_atomic_helper_crtc_destroy_state(state);
kfree(cstate);
......@@ -1220,8 +1037,6 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
/* duplicate base helper */
__drm_atomic_helper_crtc_duplicate_state(crtc, &cstate->base);
_dpu_crtc_rp_duplicate(&old_cstate->rp, &cstate->rp);
return &cstate->base;
}
......@@ -1258,9 +1073,6 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
return;
}
_dpu_crtc_rp_reset(&cstate->rp, &dpu_crtc->rp_lock,
&dpu_crtc->rp_head);
cstate->base.crtc = crtc;
crtc->state = &cstate->base;
}
......@@ -1653,7 +1465,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
}
end:
_dpu_crtc_rp_free_unused(&cstate->rp);
kfree(pstates);
return rc;
}
......@@ -1822,8 +1633,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
{
struct drm_crtc *crtc = (struct drm_crtc *) s->private;
struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
struct dpu_crtc_res *res;
struct dpu_crtc_respool *rp;
int i;
seq_printf(s, "client type: %d\n", dpu_crtc_get_client_type(crtc));
......@@ -1840,17 +1649,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
dpu_crtc->cur_perf.max_per_pipe_ib[i]);
}
mutex_lock(&dpu_crtc->rp_lock);
list_for_each_entry(rp, &dpu_crtc->rp_head, rp_list) {
seq_printf(s, "rp.%d: ", rp->sequence_id);
list_for_each_entry(res, &rp->res_list, list)
seq_printf(s, "0x%x/0x%llx/%pK/%d ",
res->type, res->tag, res->val,
atomic_read(&res->refcount));
seq_puts(s, "\n");
}
mutex_unlock(&dpu_crtc->rp_lock);
return 0;
}
DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_crtc_debugfs_state);
......@@ -1965,9 +1763,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane,
spin_lock_init(&dpu_crtc->spin_lock);
atomic_set(&dpu_crtc->frame_pending, 0);
mutex_init(&dpu_crtc->rp_lock);
INIT_LIST_HEAD(&dpu_crtc->rp_head);
init_completion(&dpu_crtc->frame_done_comp);
INIT_LIST_HEAD(&dpu_crtc->frame_event_list);
......
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
View file @ 726bcbb7
......@@ -159,8 +159,6 @@ struct dpu_crtc_frame_event {
* @phandle: Pointer to power handler
* @power_event : registered power event handle
* @cur_perf : current performance committed to clock/bandwidth driver
* @rp_lock : serialization lock for resource pool
* @rp_head : list of active resource pool
*/
struct dpu_crtc {
struct drm_crtc base;
......@@ -207,64 +205,11 @@ struct dpu_crtc {
struct dpu_core_perf_params cur_perf;
struct mutex rp_lock;
struct list_head rp_head;
struct dpu_crtc_smmu_state_data smmu_state;
};
#define to_dpu_crtc(x) container_of(x, struct dpu_crtc, base)
/**
* struct dpu_crtc_res_ops - common operations for crtc resources
* @get: get given resource
* @put: put given resource
*/
struct dpu_crtc_res_ops {
void *(*get)(void *val, u32 type, u64 tag);
void (*put)(void *val);
};
#define DPU_CRTC_RES_FLAG_FREE BIT(0)
/**
* struct dpu_crtc_res - definition of crtc resources
* @list: list of crtc resource
* @type: crtc resource type
* @tag: unique identifier per type
* @refcount: reference/usage count
* @ops: callback operations
* @val: resource handle associated with type/tag
* @flags: customization flags
*/
struct dpu_crtc_res {
struct list_head list;
u32 type;
u64 tag;
atomic_t refcount;
struct dpu_crtc_res_ops ops;
void *val;
u32 flags;
};
/**
* dpu_crtc_respool - crtc resource pool
* @rp_lock: pointer to serialization lock
* @rp_head: pointer to head of active resource pools of this crtc
* @rp_list: list of crtc resource pool
* @sequence_id: sequence identifier, incremented per state duplication
* @res_list: list of resource managed by this resource pool
* @ops: resource operations for parent resource pool
*/
struct dpu_crtc_respool {
struct mutex *rp_lock;
struct list_head *rp_head;
struct list_head rp_list;
u32 sequence_id;
struct list_head res_list;
struct dpu_crtc_res_ops ops;
};
/**
* struct dpu_crtc_state - dpu container for atomic crtc state
* @base: Base drm crtc state structure
......@@ -290,7 +235,6 @@ struct dpu_crtc_state {
uint64_t input_fence_timeout_ns;
struct dpu_core_perf_params new_perf;
struct dpu_crtc_respool rp;
};
#define to_dpu_crtc_state(x) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7