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

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

Browse source 
This reverts 'commit 1cab338540 ("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>
This commit is contained in:
Narendra Muppalla 2017-01-25 11:26:21 -08:00
parent ab0bad483d
commit e62b597893
2 changed files with 4 additions and 6 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,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;
};
/**

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 = {
{.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 = {