diff options
| author | Narendra Muppalla <NarendraM@codeaurora.org> | 2017-01-25 11:26:21 -0800 |
|---|---|---|
| committer | Narendra Muppalla <NarendraM@codeaurora.org> | 2017-01-25 17:39:25 -0800 |
| commit | e62b597893e84d3eea750df0ecc98daf86c2b622 (patch) | |
| tree | 75c744b6d05a38cc1d2e94cfc7040a6e06ba4d27 /drivers/gpu | |
| parent | ab0bad483d3ae16fedf44bc4f2a64a64b7088c3d (diff) | |
Revert "drm/msm/sde: add controller instance to INTF block in catalog"
This reverts 'commit 1cab3385401f ("drm/msm/sde: add
controller instance to INTF block in catalog")'
This is partial change for display drm driver,
that will break drm/sde merge commit.
Change-Id: Id950e4f131b9330908f65c431fca34cddf96b5ee
Signed-off-by: Narendra Muppalla <NarendraM@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, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h index 1d1788bcef62..64751fa4fddf 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h +++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h @@ -371,12 +371,10 @@ 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 a958cc46ee4a..5390742745e6 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, .controller_id = 0}, + .type = INTF_NONE}, {.id = INTF_1, .base = 0x0006B800, - .type = INTF_DSI, .controller_id = 0}, + .type = INTF_DSI}, {.id = INTF_2, .base = 0x0006C000, - .type = INTF_DSI, .controller_id = 1}, + .type = INTF_DSI}, {.id = INTF_3, .base = 0x0006C800, - .type = INTF_HDMI, .controller_id = 0}, + .type = INTF_HDMI}, }, .wb_count = 3, .wb = { |