evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/msm/sde: add controller instance to INTF block in catalog

Browse source 
Controller Instance ID differentiates between INTFs of the same type.
E.g. which DSI INTF is primary, which is secondary.

Change-Id: Icc47df59a24faa2a019ab190d6c835a0ac93024d
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
This commit is contained in:
Lloyd Atkinson 2015-11-05 15:52:07 -05:00 • committed by Krishna Srinivas Kundurthi
parent 815cfffb81
commit 1cab338540
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/msm/sde/sde_hw_catalog.h
View file

@ -371,10 +371,12 @@ struct sde_cdm_cfg {
* @base register offset of this block * @base register offset of this block
* @features bit mask identifying sub-blocks/features * @features bit mask identifying sub-blocks/features
* @type: Interface type(DSI, DP, HDMI) * @type: Interface type(DSI, DP, HDMI)
* @controller_id: Controller Instance ID in case of multiple of intf type
*/ */
struct sde_intf_cfg { struct sde_intf_cfg {
SDE_HW_BLK_INFO; SDE_HW_BLK_INFO;
u32 type; /* interface type*/ u32 type; /* interface type*/
u32 controller_id;
}; };
/** /**

8
drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c
View file

@ -244,13 +244,13 @@ static inline int set_cfg_1xx_init(struct sde_mdss_cfg *cfg)
.intf_count = 4, .intf_count = 4,
.intf = { .intf = {
{.id = INTF_0, .base = 0x0006B000, {.id = INTF_0, .base = 0x0006B000,
.type = INTF_NONE}, .type = INTF_NONE, .controller_id = 0},
{.id = INTF_1, .base = 0x0006B800, {.id = INTF_1, .base = 0x0006B800,
.type = INTF_DSI}, .type = INTF_DSI, .controller_id = 0},
{.id = INTF_2, .base = 0x0006C000, {.id = INTF_2, .base = 0x0006C000,
.type = INTF_DSI}, .type = INTF_DSI, .controller_id = 1},
{.id = INTF_3, .base = 0x0006C800, {.id = INTF_3, .base = 0x0006C800,
.type = INTF_HDMI}, .type = INTF_HDMI, .controller_id = 0},
}, },
.wb_count = 3, .wb_count = 3,
.wb = { .wb = {