diff options
| author | Lloyd Atkinson <latkinso@codeaurora.org> | 2015-11-05 15:52:07 -0500 |
|---|---|---|
| committer | Krishna Srinivas Kundurthi <kskund@codeaurora.org> | 2017-01-12 11:10:32 -0800 |
| commit | 1cab3385401fd23e9faf001a3de24e22bf255264 (patch) | |
| tree | 5228e7d078bd454a77409a4f8775898e24a94ea6 | |
| parent | 815cfffb81dd04460e93e938e82bdea2f7f18bee (diff) | |
drm/msm/sde: add controller instance to INTF block in catalog
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>
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_catalog.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h index 64751fa4fddf..1d1788bcef62 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h +++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h @@ -371,10 +371,12 @@ struct sde_cdm_cfg { * @base register offset of this block * @features bit mask identifying sub-blocks/features * @type: Interface type(DSI, DP, HDMI) + * @controller_id: Controller Instance ID in case of multiple of intf type */ struct sde_intf_cfg { SDE_HW_BLK_INFO; u32 type; /* interface type*/ + u32 controller_id; }; /** diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c b/drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c index 5390742745e6..a958cc46ee4a 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c @@ -244,13 +244,13 @@ static inline int set_cfg_1xx_init(struct sde_mdss_cfg *cfg) .intf_count = 4, .intf = { {.id = INTF_0, .base = 0x0006B000, - .type = INTF_NONE}, + .type = INTF_NONE, .controller_id = 0}, {.id = INTF_1, .base = 0x0006B800, - .type = INTF_DSI}, + .type = INTF_DSI, .controller_id = 0}, {.id = INTF_2, .base = 0x0006C000, - .type = INTF_DSI}, + .type = INTF_DSI, .controller_id = 1}, {.id = INTF_3, .base = 0x0006C800, - .type = INTF_HDMI}, + .type = INTF_HDMI, .controller_id = 0}, }, .wb_count = 3, .wb = { |