From patchwork Wed Nov 30 07:46:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kumar Borah X-Patchwork-Id: 13059504 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C4FEFC433FE for ; Wed, 30 Nov 2022 07:46:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EE7E10E41C; Wed, 30 Nov 2022 07:46:08 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id F089010E41A for ; Wed, 30 Nov 2022 07:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669794345; x=1701330345; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JrllMEZyt3Ib81YdFDuFqlMmjCsNQQKlm083IcMAi7o=; b=XUNbQxORch1w51XWAdo2LXnoiUs5UA0FJ2jHJtQsqb2B/ugVlRMKM8LS nJZSXQSGpCHEvqskIzfffCiBCkPObTDryHfdHykI9SuFNSYt3zb/QOG/G 305GQK8aeBjZFoW3tpgL/tyQiUZ+YcLMuAVu5vXf/Lqtmp/yeKLBbW9j7 pUaqzVcrXDRBqw5RQcd/tvNk1nwZZiSpaAo1Fsg7r62+FmaFep76HJ4+D Tac7HxUyHZpWTNuAFTu0rxT4yVpKd7BkajuqIk7ozr0nSseHhGi5LEX/c d001xE2Zg3gCyfMvFgK+WwwtsE/Ru2dqyczTFdFFhlE43mguPg+sl1a9Z g==; X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="401610676" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="401610676" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2022 23:45:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="973003877" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="973003877" Received: from chaitanya.iind.intel.com ([10.190.239.113]) by fmsmga005.fm.intel.com with ESMTP; 29 Nov 2022 23:45:43 -0800 From: Chaitanya Kumar Borah To: intel-gfx@lists.freedesktop.org Date: Wed, 30 Nov 2022 13:16:16 +0530 Message-Id: <20221130074617.1619099-2-chaitanya.kumar.borah@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221130074617.1619099-1-chaitanya.kumar.borah@intel.com> References: <20221130074617.1619099-1-chaitanya.kumar.borah@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RFC 1/2] drm/i915: Add RPL-U CDCLK table 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: ville.syrjala@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" A new step of 480MHz has been added on SKUs that have a RPL-U device id. Add a new table which include this new CDCLK step. BSpec: 55409 Signed-off-by: Chaitanya Kumar Borah --- drivers/gpu/drm/i915/display/intel_cdclk.c | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index 0c107a38f9d0..9bfeb1abba47 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -180,6 +180,18 @@ static void i85x_get_cdclk(struct drm_i915_private *dev_priv, } } +static bool is_rplu(struct drm_i915_private *dev_priv) +{ + switch (INTEL_DEVID(dev_priv)) { + case 0xA7A1: + case 0xA721: + case 0xA7A9: + return true; + default: + return false; + } +} + static void i915gm_get_cdclk(struct drm_i915_private *dev_priv, struct intel_cdclk_config *cdclk_config) { @@ -1329,6 +1341,27 @@ static const struct intel_cdclk_vals adlp_cdclk_table[] = { {} }; +static const struct intel_cdclk_vals rplu_cdclk_table[] = { + { .refclk = 19200, .cdclk = 172800, .divider = 3, .ratio = 27 }, + { .refclk = 19200, .cdclk = 192000, .divider = 2, .ratio = 20 }, + { .refclk = 19200, .cdclk = 480000, .divider = 2, .ratio = 50 }, + { .refclk = 19200, .cdclk = 556800, .divider = 2, .ratio = 58 }, + { .refclk = 19200, .cdclk = 652800, .divider = 2, .ratio = 68 }, + + { .refclk = 24000, .cdclk = 176000, .divider = 3, .ratio = 22 }, + { .refclk = 24000, .cdclk = 192000, .divider = 2, .ratio = 16 }, + { .refclk = 24000, .cdclk = 480000, .divider = 2, .ratio = 40 }, + { .refclk = 24000, .cdclk = 552000, .divider = 2, .ratio = 46 }, + { .refclk = 24400, .cdclk = 648000, .divider = 2, .ratio = 54 }, + + { .refclk = 38400, .cdclk = 179200, .divider = 3, .ratio = 14 }, + { .refclk = 38400, .cdclk = 192000, .divider = 2, .ratio = 10 }, + { .refclk = 38400, .cdclk = 480000, .divider = 2, .ratio = 25 }, + { .refclk = 38400, .cdclk = 556800, .divider = 2, .ratio = 29 }, + { .refclk = 38400, .cdclk = 652800, .divider = 2, .ratio = 34 }, + {} +}; + static const struct intel_cdclk_vals dg2_cdclk_table[] = { { .refclk = 38400, .cdclk = 163200, .divider = 2, .ratio = 34, .waveform = 0x8888 }, { .refclk = 38400, .cdclk = 204000, .divider = 2, .ratio = 34, .waveform = 0x9248 }, @@ -3353,6 +3386,12 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) /* Wa_22011320316:adl-p[a0] */ if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) dev_priv->display.cdclk.table = adlp_a_step_cdclk_table; + /* + * BSpec: 55409 + * 480 MHz supported on SKUs that have a RPL-U Device ID + */ + else if (is_rplu(dev_priv)) + dev_priv->cdclk.table = rplu_cdclk_table; else dev_priv->display.cdclk.table = adlp_cdclk_table; } else if (IS_ROCKETLAKE(dev_priv)) { From patchwork Wed Nov 30 07:46:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kumar Borah X-Patchwork-Id: 13059503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EBFD0C4321E for ; Wed, 30 Nov 2022 07:45:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CF0C10E41B; Wed, 30 Nov 2022 07:45:58 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E55A10E41B for ; Wed, 30 Nov 2022 07:45:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669794348; x=1701330348; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Jky2EXSA+dREtL9ZyhjN4LUFaRTjYSV9/CTMHk2ni7U=; b=V9WZNhPcwWoxxKZ9qFCWDMijvW5Q5nfaqGgTvA3KXNCPVbSkTErFSYSE WtOHb97q45P/eHzixnbyUtHQEnSrfwquZrEODlt2F/0iq7A3jdF/kXsVE dOF8EWkINaG/3JxCz7KZetu/1zTFpktxiLd6/s3KA0Zd6Ys+R/9Xj7HO7 hGjxABiKkOwHHbwYVnuN9ih5alR6XnxJyOaWR5KqBEOsYkGzu+cvkky02 zhnLdUt7wplxje+vK7hdGjpAluzqCeqnnFomSiW692r3BOMb27vT3IWTM dOokWhhZcoUERb8Be5Y0oCAOQljWGqiceYcnqrrKw5178NJ5dwXmWC7Jr w==; X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="401610681" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="401610681" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2022 23:45:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="973003891" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="973003891" Received: from chaitanya.iind.intel.com ([10.190.239.113]) by fmsmga005.fm.intel.com with ESMTP; 29 Nov 2022 23:45:46 -0800 From: Chaitanya Kumar Borah To: intel-gfx@lists.freedesktop.org Date: Wed, 30 Nov 2022 13:16:17 +0530 Message-Id: <20221130074617.1619099-3-chaitanya.kumar.borah@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221130074617.1619099-1-chaitanya.kumar.borah@intel.com> References: <20221130074617.1619099-1-chaitanya.kumar.borah@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RFC 2/2] drm/i915: Add additional check for 480Mhz step CDCLK 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: ville.syrjala@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" There are still RPL-U boards which does not support the 480Mhz step of CDCLK. We can differentiate these board by checking the CPUID Brand String. 480Mhz step is only supported in SKUs which does not contain the string "Genuine Intel" in the Brand string. BSpec: 55409 Signed-off-by: Chaitanya Kumar Borah --- drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index 9bfeb1abba47..1890e5135cfc 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -192,6 +192,19 @@ static bool is_rplu(struct drm_i915_private *dev_priv) } } +static bool is_480mhz_step_valid(void) +{ + struct cpuinfo_x86 *c; + unsigned int cpu = smp_processor_id(); + + c = &cpu_data(cpu); + + if (c->x86_model_id[0] && !strstr(c->x86_model_id, "Genuine Intel")) + return true; + + return false; +} + static void i915gm_get_cdclk(struct drm_i915_private *dev_priv, struct intel_cdclk_config *cdclk_config) { @@ -3389,8 +3402,9 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) /* * BSpec: 55409 * 480 MHz supported on SKUs that have a RPL-U Device ID + * and CPUID Brand String that does not contain "Genuine Intel". */ - else if (is_rplu(dev_priv)) + else if (is_rplu(dev_priv) && is_480mhz_step_valid()) dev_priv->cdclk.table = rplu_cdclk_table; else dev_priv->display.cdclk.table = adlp_cdclk_table;