mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
drm/i915: Don't use the child device parsed from VBT to setup HDMI/DP
On some boxes the BIOS will report different child device arrays when
the system is booted with/without the dock. In such case the HDMI/DP
port can't be setup correctly. So revert two commits
(fc816655236cd9da162356e96e74c7cfb0834d92/
6e36595a21
) that use the child device
parsed from VBT to setup HDMI/DP.
http://bugzilla.kernel.org/show_bug.cgi?id=14854
http://bugzilla.kernel.org/show_bug.cgi?id=14860
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Tested-by: Sean Young <sean@mess.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
d8e292093a
commit
6207937d4f
2 changed files with 0 additions and 100 deletions
|
@ -1289,53 +1289,7 @@ intel_dp_hot_plug(struct intel_output *intel_output)
|
|||
if (dp_priv->dpms_mode == DRM_MODE_DPMS_ON)
|
||||
intel_dp_check_link_status(intel_output);
|
||||
}
|
||||
/*
|
||||
* Enumerate the child dev array parsed from VBT to check whether
|
||||
* the given DP is present.
|
||||
* If it is present, return 1.
|
||||
* If it is not present, return false.
|
||||
* If no child dev is parsed from VBT, it is assumed that the given
|
||||
* DP is present.
|
||||
*/
|
||||
static int dp_is_present_in_vbt(struct drm_device *dev, int dp_reg)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
struct child_device_config *p_child;
|
||||
int i, dp_port, ret;
|
||||
|
||||
if (!dev_priv->child_dev_num)
|
||||
return 1;
|
||||
|
||||
dp_port = 0;
|
||||
if (dp_reg == DP_B || dp_reg == PCH_DP_B)
|
||||
dp_port = PORT_IDPB;
|
||||
else if (dp_reg == DP_C || dp_reg == PCH_DP_C)
|
||||
dp_port = PORT_IDPC;
|
||||
else if (dp_reg == DP_D || dp_reg == PCH_DP_D)
|
||||
dp_port = PORT_IDPD;
|
||||
|
||||
ret = 0;
|
||||
for (i = 0; i < dev_priv->child_dev_num; i++) {
|
||||
p_child = dev_priv->child_dev + i;
|
||||
/*
|
||||
* If the device type is not DP, continue.
|
||||
*/
|
||||
if (p_child->device_type != DEVICE_TYPE_DP &&
|
||||
p_child->device_type != DEVICE_TYPE_eDP)
|
||||
continue;
|
||||
/* Find the eDP port */
|
||||
if (dp_reg == DP_A && p_child->device_type == DEVICE_TYPE_eDP) {
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
/* Find the DP port */
|
||||
if (p_child->dvo_port == dp_port) {
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
void
|
||||
intel_dp_init(struct drm_device *dev, int output_reg)
|
||||
{
|
||||
|
@ -1345,10 +1299,6 @@ intel_dp_init(struct drm_device *dev, int output_reg)
|
|||
struct intel_dp_priv *dp_priv;
|
||||
const char *name = NULL;
|
||||
|
||||
if (!dp_is_present_in_vbt(dev, output_reg)) {
|
||||
DRM_DEBUG_KMS("DP is not present. Ignore it\n");
|
||||
return;
|
||||
}
|
||||
intel_output = kcalloc(sizeof(struct intel_output) +
|
||||
sizeof(struct intel_dp_priv), 1, GFP_KERNEL);
|
||||
if (!intel_output)
|
||||
|
|
|
@ -225,52 +225,6 @@ static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
|
|||
.destroy = intel_hdmi_enc_destroy,
|
||||
};
|
||||
|
||||
/*
|
||||
* Enumerate the child dev array parsed from VBT to check whether
|
||||
* the given HDMI is present.
|
||||
* If it is present, return 1.
|
||||
* If it is not present, return false.
|
||||
* If no child dev is parsed from VBT, it assumes that the given
|
||||
* HDMI is present.
|
||||
*/
|
||||
static int hdmi_is_present_in_vbt(struct drm_device *dev, int hdmi_reg)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
struct child_device_config *p_child;
|
||||
int i, hdmi_port, ret;
|
||||
|
||||
if (!dev_priv->child_dev_num)
|
||||
return 1;
|
||||
|
||||
if (hdmi_reg == SDVOB)
|
||||
hdmi_port = DVO_B;
|
||||
else if (hdmi_reg == SDVOC)
|
||||
hdmi_port = DVO_C;
|
||||
else if (hdmi_reg == HDMIB)
|
||||
hdmi_port = DVO_B;
|
||||
else if (hdmi_reg == HDMIC)
|
||||
hdmi_port = DVO_C;
|
||||
else if (hdmi_reg == HDMID)
|
||||
hdmi_port = DVO_D;
|
||||
else
|
||||
return 0;
|
||||
|
||||
ret = 0;
|
||||
for (i = 0; i < dev_priv->child_dev_num; i++) {
|
||||
p_child = dev_priv->child_dev + i;
|
||||
/*
|
||||
* If the device type is not HDMI, continue.
|
||||
*/
|
||||
if (p_child->device_type != DEVICE_TYPE_HDMI)
|
||||
continue;
|
||||
/* Find the HDMI port */
|
||||
if (p_child->dvo_port == hdmi_port) {
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
|
@ -278,10 +232,6 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
|
|||
struct intel_output *intel_output;
|
||||
struct intel_hdmi_priv *hdmi_priv;
|
||||
|
||||
if (!hdmi_is_present_in_vbt(dev, sdvox_reg)) {
|
||||
DRM_DEBUG_KMS("HDMI is not present. Ignored it \n");
|
||||
return;
|
||||
}
|
||||
intel_output = kcalloc(sizeof(struct intel_output) +
|
||||
sizeof(struct intel_hdmi_priv), 1, GFP_KERNEL);
|
||||
if (!intel_output)
|
||||
|
|
Loading…
Reference in a new issue