From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755489AbcBBOfw (ORCPT ); Tue, 2 Feb 2016 09:35:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47636 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754956AbcBBOfa (ORCPT ); Tue, 2 Feb 2016 09:35:30 -0500 From: Lyude To: Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie Cc: Rob Clark , Adam Jackson , Lyude Subject: [PATCH 2/2] drm/i915/skl: Explicitly check for eDP in skl_ddi_pll_select() Date: Tue, 2 Feb 2016 09:35:09 -0500 Message-Id: <1454423709-21882-2-git-send-email-cpaul@redhat.com> In-Reply-To: <1454423709-21882-1-git-send-email-cpaul@redhat.com> References: <1454423709-21882-1-git-send-email-cpaul@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Assuming any connector that isn't DP, MST, or HDMI is eDP definitely seems likely to cover up other bugs in the future. Signed-off-by: Lyude --- drivers/gpu/drm/i915/intel_ddi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 54a165b..e2adc380 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1604,8 +1604,10 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, } cfgcr1 = cfgcr2 = 0; - } else /* eDP */ + } else if (intel_encoder->type == INTEL_OUTPUT_EDP) { return true; + } else + return false; memset(&crtc_state->dpll_hw_state, 0, sizeof(crtc_state->dpll_hw_state)); -- 2.5.0