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

drm/i915/chv: Register port D encoders and connectors

Browse source 
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-04-09 13:28:56 +03:00 • committed by Daniel Vetter
parent 71485e0aa8
commit 9418c1f176
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_reg.h
View file

@ -2457,6 +2457,7 @@ enum punit_power_well {
#define GEN3_SDVOC 0x61160 #define GEN3_SDVOC 0x61160
#define GEN4_HDMIB GEN3_SDVOB #define GEN4_HDMIB GEN3_SDVOB
#define GEN4_HDMIC GEN3_SDVOC #define GEN4_HDMIC GEN3_SDVOC
#define CHV_HDMID 0x6116C
#define PCH_SDVOB 0xe1140 #define PCH_SDVOB 0xe1140
#define PCH_HDMIB PCH_SDVOB #define PCH_HDMIB PCH_SDVOB
#define PCH_HDMIC 0xe1150 #define PCH_HDMIC 0xe1150

9
drivers/gpu/drm/i915/intel_display.c
View file

@ -11053,6 +11053,15 @@ static void intel_setup_outputs(struct drm_device *dev)
intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C); intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);
} }
if (IS_CHERRYVIEW(dev)) {
if (I915_READ(VLV_DISPLAY_BASE + CHV_HDMID) & SDVO_DETECTED) {
intel_hdmi_init(dev, VLV_DISPLAY_BASE + CHV_HDMID,
PORT_D);
if (I915_READ(VLV_DISPLAY_BASE + DP_D) & DP_DETECTED)
intel_dp_init(dev, VLV_DISPLAY_BASE + DP_D, PORT_D);
}
}
intel_dsi_init(dev); intel_dsi_init(dev);
} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
bool found = false; bool found = false;