drm/msm/dpu: merge struct dpu_irq into struct dpu_hw_intr
As dpu_core_irq was merged into dpu_hw_intr, merge data structures too, removing the need for a separate data structure. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> Link: https://lore.kernel.org/r/20210617222029.463045-4-dmitry.baryshkov@linaro.org Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
parent
6087623e7c
commit
f25f656608
@ -127,20 +127,19 @@ static const struct dpu_intr_reg dpu_intr_set[] = {
|
||||
*/
|
||||
static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, int irq_idx)
|
||||
{
|
||||
struct dpu_irq *irq_obj = &dpu_kms->irq_obj;
|
||||
struct dpu_irq_callback *cb;
|
||||
|
||||
VERB("irq_idx=%d\n", irq_idx);
|
||||
|
||||
if (list_empty(&irq_obj->irq_cb_tbl[irq_idx]))
|
||||
if (list_empty(&dpu_kms->hw_intr->irq_cb_tbl[irq_idx]))
|
||||
DRM_ERROR("no registered cb, idx:%d\n", irq_idx);
|
||||
|
||||
atomic_inc(&irq_obj->irq_counts[irq_idx]);
|
||||
atomic_inc(&dpu_kms->hw_intr->irq_counts[irq_idx]);
|
||||
|
||||
/*
|
||||
* Perform registered function callback
|
||||
*/
|
||||
list_for_each_entry(cb, &irq_obj->irq_cb_tbl[irq_idx], list)
|
||||
list_for_each_entry(cb, &dpu_kms->hw_intr->irq_cb_tbl[irq_idx], list)
|
||||
if (cb->func)
|
||||
cb->func(cb->arg, irq_idx);
|
||||
}
|
||||
@ -420,6 +419,10 @@ void dpu_hw_intr_destroy(struct dpu_hw_intr *intr)
|
||||
{
|
||||
if (intr) {
|
||||
kfree(intr->cache_irq_mask);
|
||||
|
||||
kfree(intr->irq_cb_tbl);
|
||||
kfree(intr->irq_counts);
|
||||
|
||||
kfree(intr);
|
||||
}
|
||||
}
|
||||
@ -429,7 +432,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
|
||||
{
|
||||
unsigned long irq_flags;
|
||||
|
||||
if (!dpu_kms->irq_obj.irq_cb_tbl) {
|
||||
if (!dpu_kms->hw_intr->irq_cb_tbl) {
|
||||
DPU_ERROR("invalid params\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -453,9 +456,9 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
|
||||
trace_dpu_core_irq_register_callback(irq_idx, register_irq_cb);
|
||||
list_del_init(®ister_irq_cb->list);
|
||||
list_add_tail(®ister_irq_cb->list,
|
||||
&dpu_kms->irq_obj.irq_cb_tbl[irq_idx]);
|
||||
&dpu_kms->hw_intr->irq_cb_tbl[irq_idx]);
|
||||
if (list_is_first(®ister_irq_cb->list,
|
||||
&dpu_kms->irq_obj.irq_cb_tbl[irq_idx])) {
|
||||
&dpu_kms->hw_intr->irq_cb_tbl[irq_idx])) {
|
||||
int ret = dpu_hw_intr_enable_irq_locked(
|
||||
dpu_kms->hw_intr,
|
||||
irq_idx);
|
||||
@ -473,7 +476,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx,
|
||||
{
|
||||
unsigned long irq_flags;
|
||||
|
||||
if (!dpu_kms->irq_obj.irq_cb_tbl) {
|
||||
if (!dpu_kms->hw_intr->irq_cb_tbl) {
|
||||
DPU_ERROR("invalid params\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -497,7 +500,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx,
|
||||
trace_dpu_core_irq_unregister_callback(irq_idx, register_irq_cb);
|
||||
list_del_init(®ister_irq_cb->list);
|
||||
/* empty callback list but interrupt is still enabled */
|
||||
if (list_empty(&dpu_kms->irq_obj.irq_cb_tbl[irq_idx])) {
|
||||
if (list_empty(&dpu_kms->hw_intr->irq_cb_tbl[irq_idx])) {
|
||||
int ret = dpu_hw_intr_disable_irq_locked(
|
||||
dpu_kms->hw_intr,
|
||||
irq_idx);
|
||||
@ -515,19 +518,18 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx,
|
||||
static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = s->private;
|
||||
struct dpu_irq *irq_obj = &dpu_kms->irq_obj;
|
||||
struct dpu_irq_callback *cb;
|
||||
unsigned long irq_flags;
|
||||
int i, irq_count, cb_count;
|
||||
|
||||
if (WARN_ON(!irq_obj->irq_cb_tbl))
|
||||
if (WARN_ON(!dpu_kms->hw_intr->irq_cb_tbl))
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < irq_obj->total_irqs; i++) {
|
||||
for (i = 0; i < dpu_kms->hw_intr->total_irqs; i++) {
|
||||
spin_lock_irqsave(&dpu_kms->hw_intr->irq_lock, irq_flags);
|
||||
cb_count = 0;
|
||||
irq_count = atomic_read(&irq_obj->irq_counts[i]);
|
||||
list_for_each_entry(cb, &irq_obj->irq_cb_tbl[i], list)
|
||||
irq_count = atomic_read(&dpu_kms->hw_intr->irq_counts[i]);
|
||||
list_for_each_entry(cb, &dpu_kms->hw_intr->irq_cb_tbl[i], list)
|
||||
cb_count++;
|
||||
spin_unlock_irqrestore(&dpu_kms->hw_intr->irq_lock, irq_flags);
|
||||
|
||||
@ -559,14 +561,13 @@ void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
|
||||
pm_runtime_put_sync(&dpu_kms->pdev->dev);
|
||||
|
||||
/* Create irq callbacks for all possible irq_idx */
|
||||
dpu_kms->irq_obj.total_irqs = dpu_kms->hw_intr->total_irqs;
|
||||
dpu_kms->irq_obj.irq_cb_tbl = kcalloc(dpu_kms->irq_obj.total_irqs,
|
||||
dpu_kms->hw_intr->irq_cb_tbl = kcalloc(dpu_kms->hw_intr->total_irqs,
|
||||
sizeof(struct list_head), GFP_KERNEL);
|
||||
dpu_kms->irq_obj.irq_counts = kcalloc(dpu_kms->irq_obj.total_irqs,
|
||||
dpu_kms->hw_intr->irq_counts = kcalloc(dpu_kms->hw_intr->total_irqs,
|
||||
sizeof(atomic_t), GFP_KERNEL);
|
||||
for (i = 0; i < dpu_kms->irq_obj.total_irqs; i++) {
|
||||
INIT_LIST_HEAD(&dpu_kms->irq_obj.irq_cb_tbl[i]);
|
||||
atomic_set(&dpu_kms->irq_obj.irq_counts[i], 0);
|
||||
for (i = 0; i < dpu_kms->hw_intr->total_irqs; i++) {
|
||||
INIT_LIST_HEAD(&dpu_kms->hw_intr->irq_cb_tbl[i]);
|
||||
atomic_set(&dpu_kms->hw_intr->irq_counts[i], 0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -575,17 +576,11 @@ void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms)
|
||||
int i;
|
||||
|
||||
pm_runtime_get_sync(&dpu_kms->pdev->dev);
|
||||
for (i = 0; i < dpu_kms->irq_obj.total_irqs; i++)
|
||||
if (!list_empty(&dpu_kms->irq_obj.irq_cb_tbl[i]))
|
||||
for (i = 0; i < dpu_kms->hw_intr->total_irqs; i++)
|
||||
if (!list_empty(&dpu_kms->hw_intr->irq_cb_tbl[i]))
|
||||
DPU_ERROR("irq_idx=%d still enabled/registered\n", i);
|
||||
|
||||
dpu_clear_irqs(dpu_kms);
|
||||
dpu_disable_all_irqs(dpu_kms);
|
||||
pm_runtime_put_sync(&dpu_kms->pdev->dev);
|
||||
|
||||
kfree(dpu_kms->irq_obj.irq_cb_tbl);
|
||||
kfree(dpu_kms->irq_obj.irq_counts);
|
||||
dpu_kms->irq_obj.irq_cb_tbl = NULL;
|
||||
dpu_kms->irq_obj.irq_counts = NULL;
|
||||
dpu_kms->irq_obj.total_irqs = 0;
|
||||
}
|
||||
|
@ -40,6 +40,8 @@ enum dpu_hw_intr_reg {
|
||||
* @save_irq_status: array of IRQ status reg storage created during init
|
||||
* @total_irqs: total number of irq_idx mapped in the hw_interrupts
|
||||
* @irq_lock: spinlock for accessing IRQ resources
|
||||
* @irq_cb_tbl: array of IRQ callbacks lists
|
||||
* @irq_counts: array of IRQ counts
|
||||
*/
|
||||
struct dpu_hw_intr {
|
||||
struct dpu_hw_blk_reg_map hw;
|
||||
@ -48,6 +50,9 @@ struct dpu_hw_intr {
|
||||
u32 total_irqs;
|
||||
spinlock_t irq_lock;
|
||||
unsigned long irq_mask;
|
||||
|
||||
struct list_head *irq_cb_tbl;
|
||||
atomic_t *irq_counts;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -78,18 +78,6 @@ struct dpu_irq_callback {
|
||||
void *arg;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct dpu_irq: IRQ structure contains callback registration info
|
||||
* @total_irq: total number of irq_idx obtained from HW interrupts mapping
|
||||
* @irq_cb_tbl: array of IRQ callbacks setting
|
||||
* @debugfs_file: debugfs file for irq statistics
|
||||
*/
|
||||
struct dpu_irq {
|
||||
u32 total_irqs;
|
||||
struct list_head *irq_cb_tbl;
|
||||
atomic_t *irq_counts;
|
||||
};
|
||||
|
||||
struct dpu_kms {
|
||||
struct msm_kms base;
|
||||
struct drm_device *dev;
|
||||
@ -104,7 +92,6 @@ struct dpu_kms {
|
||||
struct regulator *venus;
|
||||
|
||||
struct dpu_hw_intr *hw_intr;
|
||||
struct dpu_irq irq_obj;
|
||||
|
||||
struct dpu_core_perf perf;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user