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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 F01F0C433DB for ; Wed, 3 Feb 2021 09:33:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98F2C64F6C for ; Wed, 3 Feb 2021 09:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbhBCJc5 (ORCPT ); Wed, 3 Feb 2021 04:32:57 -0500 Received: from mga05.intel.com ([192.55.52.43]:4633 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233461AbhBCJcd (ORCPT ); Wed, 3 Feb 2021 04:32:33 -0500 IronPort-SDR: AKehEQr8PAiuntzstccfnn7RuzpR4Y8XHk0/TGjv7oK+JJXQomUFvMyjECqdWaFYJpR/rjbVfT fEnRQYggU7TQ== X-IronPort-AV: E=McAfee;i="6000,8403,9883"; a="265845235" X-IronPort-AV: E=Sophos;i="5.79,398,1602572400"; d="scan'208";a="265845235" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2021 01:30:47 -0800 IronPort-SDR: plsLEjxuFOe/ml+vJEWuRTD7G7oyTdaNNALy0AWh/4s2aI4Lh0Su04fD6MPjVL08IKma5fSx/o Tujov3rMr43A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,398,1602572400"; d="scan'208";a="372313456" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga002.jf.intel.com with SMTP; 03 Feb 2021 01:30:44 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 03 Feb 2021 11:30:44 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH] drm/i915: Reject 446-480MHz HDMI clock on GLK Date: Wed, 3 Feb 2021 11:30:44 +0200 Message-Id: <20210203093044.30532-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ville Syrjälä The BXT/GLK DPLL can't generate certain frequencies. We already reject the 233-240MHz range on both. But on GLK the DPLL max frequency was bumped from 300MHz to 594MHz, so now we get to also worry about the 446-480MHz range (double the original problem range). Reject any frequency within the higher problematic range as well. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3000 Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 66e1ac3887c6..b593a71e6517 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2218,7 +2218,11 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, has_hdmi_sink)) return MODE_CLOCK_HIGH; - /* BXT DPLL can't generate 223-240 MHz */ + /* GLK DPLL can't generate 446-480 MHz */ + if (IS_GEMINILAKE(dev_priv) && clock > 446666 && clock < 480000) + return MODE_CLOCK_RANGE; + + /* BXT/GLK DPLL can't generate 223-240 MHz */ if (IS_GEN9_LP(dev_priv) && clock > 223333 && clock < 240000) return MODE_CLOCK_RANGE; -- 2.26.2 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B56CBC433E0 for ; Wed, 3 Feb 2021 09:30:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46EF964F49 for ; Wed, 3 Feb 2021 09:30:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46EF964F49 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2A066EA31; Wed, 3 Feb 2021 09:30:49 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1B076EA31 for ; Wed, 3 Feb 2021 09:30:48 +0000 (UTC) IronPort-SDR: YEbuJwVFFca9n6UigU4UAWmjhA2BH/BUlgwGyxTfmQRjty33B/TLC1aogIMnfv4PzyIPvm2aO4 pyUfW6MgdG+g== X-IronPort-AV: E=McAfee;i="6000,8403,9883"; a="181159024" X-IronPort-AV: E=Sophos;i="5.79,398,1602572400"; d="scan'208";a="181159024" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2021 01:30:47 -0800 IronPort-SDR: plsLEjxuFOe/ml+vJEWuRTD7G7oyTdaNNALy0AWh/4s2aI4Lh0Su04fD6MPjVL08IKma5fSx/o Tujov3rMr43A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,398,1602572400"; d="scan'208";a="372313456" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga002.jf.intel.com with SMTP; 03 Feb 2021 01:30:44 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 03 Feb 2021 11:30:44 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 3 Feb 2021 11:30:44 +0200 Message-Id: <20210203093044.30532-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Reject 446-480MHz HDMI clock on GLK X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBCWFQvR0xLIERQTEwgY2FuJ3QgZ2VuZXJhdGUgY2VydGFpbiBmcmVxdWVuY2llcy4gV2UgYWxy ZWFkeQpyZWplY3QgdGhlIDIzMy0yNDBNSHogcmFuZ2Ugb24gYm90aC4gQnV0IG9uIEdMSyB0aGUg RFBMTCBtYXgKZnJlcXVlbmN5IHdhcyBidW1wZWQgZnJvbSAzMDBNSHogdG8gNTk0TUh6LCBzbyBu b3cgd2UgZ2V0IHRvCmFsc28gd29ycnkgYWJvdXQgdGhlIDQ0Ni00ODBNSHogcmFuZ2UgKGRvdWJs ZSB0aGUgb3JpZ2luYWwKcHJvYmxlbSByYW5nZSkuIFJlamVjdCBhbnkgZnJlcXVlbmN5IHdpdGhp biB0aGUgaGlnaGVyCnByb2JsZW1hdGljIHJhbmdlIGFzIHdlbGwuCgpDYzogc3RhYmxlQHZnZXIu a2VybmVsLm9yZwpDbG9zZXM6IGh0dHBzOi8vZ2l0bGFiLmZyZWVkZXNrdG9wLm9yZy9kcm0vaW50 ZWwvLS9pc3N1ZXMvMzAwMApTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfaGRtaS5jIHwgNiArKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfaGRtaS5j CmluZGV4IDY2ZTFhYzM4ODdjNi4uYjU5M2E3MWU2NTE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2hkbWkuYwpAQCAtMjIxOCw3ICsyMjE4LDExIEBAIGhkbWlfcG9ydF9j bG9ja192YWxpZChzdHJ1Y3QgaW50ZWxfaGRtaSAqaGRtaSwKIAkJCQkJICBoYXNfaGRtaV9zaW5r KSkKIAkJcmV0dXJuIE1PREVfQ0xPQ0tfSElHSDsKIAotCS8qIEJYVCBEUExMIGNhbid0IGdlbmVy YXRlIDIyMy0yNDAgTUh6ICovCisJLyogR0xLIERQTEwgY2FuJ3QgZ2VuZXJhdGUgNDQ2LTQ4MCBN SHogKi8KKwlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgJiYgY2xvY2sgPiA0NDY2NjYgJiYg Y2xvY2sgPCA0ODAwMDApCisJCXJldHVybiBNT0RFX0NMT0NLX1JBTkdFOworCisJLyogQlhUL0dM SyBEUExMIGNhbid0IGdlbmVyYXRlIDIyMy0yNDAgTUh6ICovCiAJaWYgKElTX0dFTjlfTFAoZGV2 X3ByaXYpICYmIGNsb2NrID4gMjIzMzMzICYmIGNsb2NrIDwgMjQwMDAwKQogCQlyZXR1cm4gTU9E RV9DTE9DS19SQU5HRTsKIAotLSAKMi4yNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK