Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm/dsi: Add 8x96 info in dsi_cfg

Add 8x96 DSI data in dsi_cfg. The downstream kernel's dsi_host driver
enables core_mmss_clk. We're seeing some branch clock warnings on
8x96 when enabling this. There doesn't seem to be any negative effect
with not enabling this clock, so use it once we figure out why we
get the warnings.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

authored by

Archit Taneja and committed by
Rob Clark
3a3ff88a a1b1a4f7

+26
+25
drivers/gpu/drm/msm/dsi/dsi_cfg.c
··· 94 94 .num_dsi = 2, 95 95 }; 96 96 97 + /* 98 + * TODO: core_mmss_clk fails to enable for some reason, but things work fine 99 + * without it too. Figure out why it doesn't enable and uncomment below 100 + */ 101 + static const char * const dsi_8996_bus_clk_names[] = { 102 + "mdp_core_clk", "iface_clk", "bus_clk", /* "core_mmss_clk", */ 103 + }; 104 + 105 + static const struct msm_dsi_config msm8996_dsi_cfg = { 106 + .io_offset = DSI_6G_REG_SHIFT, 107 + .reg_cfg = { 108 + .num = 2, 109 + .regs = { 110 + {"vdda", 18160, 1 }, /* 1.25 V */ 111 + {"vcca", 17000, 32 }, /* 0.925 V */ 112 + {"vddio", 100000, 100 },/* 1.8 V */ 113 + }, 114 + }, 115 + .bus_clk_names = dsi_8996_bus_clk_names, 116 + .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), 117 + .io_start = { 0x994000, 0x996000 }, 118 + .num_dsi = 2, 119 + }; 120 + 97 121 static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { 98 122 {MSM_DSI_VER_MAJOR_V2, MSM_DSI_V2_VER_MINOR_8064, &apq8064_dsi_cfg}, 99 123 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_0, ··· 130 106 &msm8974_apq8084_dsi_cfg}, 131 107 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3, &msm8994_dsi_cfg}, 132 108 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3_1, &msm8916_dsi_cfg}, 109 + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_4_1, &msm8996_dsi_cfg}, 133 110 }; 134 111 135 112 const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor)
+1
drivers/gpu/drm/msm/dsi/dsi_cfg.h
··· 24 24 #define MSM_DSI_6G_VER_MINOR_V1_2 0x10020000 25 25 #define MSM_DSI_6G_VER_MINOR_V1_3 0x10030000 26 26 #define MSM_DSI_6G_VER_MINOR_V1_3_1 0x10030001 27 + #define MSM_DSI_6G_VER_MINOR_V1_4_1 0x10040001 27 28 28 29 #define MSM_DSI_V2_VER_MINOR_8064 0x0 29 30