diff options
| author | Lloyd Atkinson <latkinso@codeaurora.org> | 2015-11-05 15:52:07 -0500 |
|---|---|---|
| committer | Dhaval Patel <pdhaval@codeaurora.org> | 2016-08-01 11:58:06 -0700 |
| commit | 24047f8d3ffde4425c34823d1025da130f02ce98 (patch) | |
| tree | da64a4337202a83c7312bec2042e1bb724115f6e /drivers/gpu | |
| parent | 729595c8f23ae8f472db01e8031aed5d8d5a3167 (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>
Diffstat (limited to 'drivers/gpu')
| -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 0d3c536cef26..9b06aca45241 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 86673e07d3db..a756c515f45e 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 = { |