From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B15DC282C2 for ; Wed, 13 Feb 2019 18:50:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1ED6720835 for ; Wed, 13 Feb 2019 18:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083853; bh=tYN6i92JDHeUUgRweWn7plxRzQ5CiUo8btN+SuoKOOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LEFpnTuB3Fy8hztcu95iE+VGQDpLpAeB93hXgEKLliPiqWaNGoURXPwxA6Ly5WJJo h7r0/aXZnnBZZeX7/eWkP6+qFrYk410cwK+imJ6fpixBQU7n9MqxWMmebC6kCR4jfu RBSzXBELxesSIyRohtlaCGyNcQ/OSbgGK1j8V3Aw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405995AbfBMSnu (ORCPT ); Wed, 13 Feb 2019 13:43:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:42416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405992AbfBMSnu (ORCPT ); Wed, 13 Feb 2019 13:43:50 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EC53220811; Wed, 13 Feb 2019 18:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083429; bh=tYN6i92JDHeUUgRweWn7plxRzQ5CiUo8btN+SuoKOOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K4mXJ/CfKwtDG/c0dMHV+3RKhhqZ4W6U+dMNqlOpMsZa9A6+qiCsD4tLWTJNu2Vxz NyejCNwKGga9aR98Gktk0OGuBjC49qBnTxqEtggvBfoHkJcdOFzQ6nkpR96NOdtwtW UXgxbPGeYoH89bIoJ1UeeZHp81jqMIg2VN9tL+aU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paulo Zanoni , Lucas De Marchi , Mika Kahola , Jani Nikula Subject: [PATCH 4.19 33/44] drm/i915: always return something on DDI clock selection Date: Wed, 13 Feb 2019 19:38:34 +0100 Message-Id: <20190213183654.576717830@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183651.648060257@linuxfoundation.org> References: <20190213183651.648060257@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lucas De Marchi commit 2a121030d4ee3f84f60c6f415f9c44bffbcde81d upstream. Even if we don't have the correct clock and get a warning, we should not skip the return. v2: improve commit message (from Joonas) Fixes: 1fa11ee2d9d0 ("drm/i915/icl: start adding the TBT pll") Cc: Paulo Zanoni Cc: # v4.19+ Signed-off-by: Lucas De Marchi Reviewed-by: Mika Kahola Link: https://patchwork.freedesktop.org/patch/msgid/20190125222444.19926-3-lucas.demarchi@intel.com (cherry picked from commit 7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1085,7 +1085,7 @@ static uint32_t icl_pll_to_ddi_pll_sel(s return DDI_CLK_SEL_TBT_810; default: MISSING_CASE(clock); - break; + return DDI_CLK_SEL_NONE; } case DPLL_ID_ICL_MGPLL1: case DPLL_ID_ICL_MGPLL2: