From 4f87e364d96f569f52e01f0cfd651a835bf441b2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: May 25 2023 06:18:51 +0000 Subject: drm/msm/dpu: Add INTF_5 interrupts (git-fixes). --- diff --git a/patches.suse/drm-msm-dpu-Add-INTF_5-interrupts.patch b/patches.suse/drm-msm-dpu-Add-INTF_5-interrupts.patch new file mode 100644 index 0000000..07cc34d --- /dev/null +++ b/patches.suse/drm-msm-dpu-Add-INTF_5-interrupts.patch @@ -0,0 +1,61 @@ +From 148e852f290fe8be9fa69953bee2f958befd65d4 Mon Sep 17 00:00:00 2001 +From: Bjorn Andersson +Date: Mon, 14 Feb 2022 20:33:52 -0800 +Subject: [PATCH] drm/msm/dpu: Add INTF_5 interrupts +Git-commit: 148e852f290fe8be9fa69953bee2f958befd65d4 +Patch-mainline: v5.18-rc1 +References: git-fixes + +SC8180x has the eDP controller wired up to INTF_5, so add the interrupt +register block for this interface to the list. + +Signed-off-by: Bjorn Andersson +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20220215043353.1256754-1-bjorn.andersson@linaro.org +Signed-off-by: Dmitry Baryshkov +Acked-by: Takashi Iwai + +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 6 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +index 27073fd49fee..c515b7cf922c 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +@@ -23,6 +23,7 @@ + #define MDP_INTF_2_OFF 0x6B000 + #define MDP_INTF_3_OFF 0x6B800 + #define MDP_INTF_4_OFF 0x6C000 ++#define MDP_INTF_5_OFF 0x6C800 + #define MDP_AD4_0_OFF 0x7C000 + #define MDP_AD4_1_OFF 0x7D000 + #define MDP_AD4_INTR_EN_OFF 0x41c +@@ -93,6 +94,11 @@ static const struct dpu_intr_reg dpu_intr_set[] = { + MDP_INTF_4_OFF+INTF_INTR_EN, + MDP_INTF_4_OFF+INTF_INTR_STATUS + }, ++ { ++ MDP_INTF_5_OFF+INTF_INTR_CLEAR, ++ MDP_INTF_5_OFF+INTF_INTR_EN, ++ MDP_INTF_5_OFF+INTF_INTR_STATUS ++ }, + { + MDP_AD4_0_OFF + MDP_AD4_INTR_CLEAR_OFF, + MDP_AD4_0_OFF + MDP_AD4_INTR_EN_OFF, +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h +index 1ab75cccd145..37379966d8ec 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h +@@ -22,6 +22,7 @@ enum dpu_hw_intr_reg { + MDP_INTF2_INTR, + MDP_INTF3_INTR, + MDP_INTF4_INTR, ++ MDP_INTF5_INTR, + MDP_AD4_0_INTR, + MDP_AD4_1_INTR, + MDP_INTF0_7xxx_INTR, +-- +2.35.3 + diff --git a/series.conf b/series.conf index 64d4955..52d8dc9 100644 --- a/series.conf +++ b/series.conf @@ -11604,6 +11604,7 @@ patches.suse/0014-drm-dp-Fix-OOB-read-when-handling-Post-Cursor2-regis.patch patches.suse/drm-bridge-cdns-dsi-Make-sure-to-to-create-proper-al.patch patches.suse/drm-msm-dpu-add-DSPP-blocks-teardown.patch + patches.suse/drm-msm-dpu-Add-INTF_5-interrupts.patch patches.suse/drm-msm-dpu-fix-dp-audio-condition.patch patches.suse/0015-drm-msm-dp-do-not-initialize-phy-until-plugin-interr.patch patches.suse/drm-msm-dp-populate-connector-of-struct-dp_panel.patch