mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
drm/msm/dpu: remove extra wrappers around dpu_core_irq
Remove extra dpu_irq_* wrappers from dpu_kms.c, merge them directly into dpu_core_irq_* functions. Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/474696/ Link: https://lore.kernel.org/r/20220217043148.480898-2-dmitry.baryshkov@linaro.org Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
parent
500ca2a10f
commit
dd77ce4da8
3 changed files with 15 additions and 33 deletions
|
@ -10,24 +10,24 @@
|
|||
|
||||
/**
|
||||
* dpu_core_irq_preinstall - perform pre-installation of core IRQ handler
|
||||
* @dpu_kms: DPU handle
|
||||
* @kms: MSM KMS handle
|
||||
* @return: none
|
||||
*/
|
||||
void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms);
|
||||
void dpu_core_irq_preinstall(struct msm_kms *kms);
|
||||
|
||||
/**
|
||||
* dpu_core_irq_uninstall - uninstall core IRQ handler
|
||||
* @dpu_kms: DPU handle
|
||||
* @kms: MSM KMS handle
|
||||
* @return: none
|
||||
*/
|
||||
void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms);
|
||||
void dpu_core_irq_uninstall(struct msm_kms *kms);
|
||||
|
||||
/**
|
||||
* dpu_core_irq - core IRQ handler
|
||||
* @dpu_kms: DPU handle
|
||||
* @kms: MSM KMS handle
|
||||
* @return: interrupt handling status
|
||||
*/
|
||||
irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms);
|
||||
irqreturn_t dpu_core_irq(struct msm_kms *kms);
|
||||
|
||||
/**
|
||||
* dpu_core_irq_read - IRQ helper function for reading IRQ status
|
||||
|
|
|
@ -168,8 +168,9 @@ static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, int irq_idx)
|
|||
cb->func(cb->arg, irq_idx);
|
||||
}
|
||||
|
||||
irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms)
|
||||
irqreturn_t dpu_core_irq(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
struct dpu_hw_intr *intr = dpu_kms->hw_intr;
|
||||
int reg_idx;
|
||||
int irq_idx;
|
||||
|
@ -575,8 +576,9 @@ void dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,
|
|||
}
|
||||
#endif
|
||||
|
||||
void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
|
||||
void dpu_core_irq_preinstall(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
int i;
|
||||
|
||||
pm_runtime_get_sync(&dpu_kms->pdev->dev);
|
||||
|
@ -595,8 +597,9 @@ void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
|
|||
}
|
||||
}
|
||||
|
||||
void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms)
|
||||
void dpu_core_irq_uninstall(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
int i;
|
||||
|
||||
pm_runtime_get_sync(&dpu_kms->pdev->dev);
|
||||
|
|
|
@ -823,20 +823,6 @@ static void dpu_kms_destroy(struct msm_kms *kms)
|
|||
pm_runtime_disable(&dpu_kms->pdev->dev);
|
||||
}
|
||||
|
||||
static irqreturn_t dpu_irq(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
|
||||
return dpu_core_irq(dpu_kms);
|
||||
}
|
||||
|
||||
static void dpu_irq_preinstall(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
|
||||
dpu_core_irq_preinstall(dpu_kms);
|
||||
}
|
||||
|
||||
static int dpu_irq_postinstall(struct msm_kms *kms)
|
||||
{
|
||||
struct msm_drm_private *priv;
|
||||
|
@ -856,13 +842,6 @@ static int dpu_irq_postinstall(struct msm_kms *kms)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void dpu_irq_uninstall(struct msm_kms *kms)
|
||||
{
|
||||
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
|
||||
|
||||
dpu_core_irq_uninstall(dpu_kms);
|
||||
}
|
||||
|
||||
static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_kms *kms)
|
||||
{
|
||||
int i;
|
||||
|
@ -915,10 +894,10 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_k
|
|||
|
||||
static const struct msm_kms_funcs kms_funcs = {
|
||||
.hw_init = dpu_kms_hw_init,
|
||||
.irq_preinstall = dpu_irq_preinstall,
|
||||
.irq_preinstall = dpu_core_irq_preinstall,
|
||||
.irq_postinstall = dpu_irq_postinstall,
|
||||
.irq_uninstall = dpu_irq_uninstall,
|
||||
.irq = dpu_irq,
|
||||
.irq_uninstall = dpu_core_irq_uninstall,
|
||||
.irq = dpu_core_irq,
|
||||
.enable_commit = dpu_kms_enable_commit,
|
||||
.disable_commit = dpu_kms_disable_commit,
|
||||
.vsync_time = dpu_kms_vsync_time,
|
||||
|
|
Loading…
Reference in a new issue