diff options
| -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 = { |