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 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 4E0F2C77B60 for ; Fri, 28 Apr 2023 18:19:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C69F610E15F; Fri, 28 Apr 2023 18:19:42 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2129010E15F for ; Fri, 28 Apr 2023 18:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682705981; x=1714241981; h=date:from:to:cc:subject:message-id:references: content-transfer-encoding:in-reply-to:mime-version; bh=5eL5Eg4RXu+hrX0cq2rJimX5L25GALs7A+LvfowoYtc=; b=ANCPQk8U0Xx42VT2eI47ZhmXfUTpJ5KaZ/r3T8EtRjkR8uK1VEvZqVIq BKDS8jU/ZRWhyhUPGJHYdlS1ZTe4dd2gPSyCbxF/bR1awwpxtDE8IfcdR atoU8s+3FK8B5bnjT8okceNHgjSN3DTWAIQ6APBQ7ygUWB+Ka5HtNEwPa LfgZjUdQXDhn9cnamHSuVARmLUo2NTucvN1U8D3YU147d/7bSnfZsNowc OIeW+oGg/we6WvHDB1GRDPHbxa/mPq2Hw50mv+Ki05OZn+dSnSwzXdnfS 5NireWp4IncHHst7ZSsWOvLgz/8Sy5VonyMnCO4MRv3uhDE/fWRcsYvS0 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10694"; a="347844645" X-IronPort-AV: E=Sophos;i="5.99,235,1677571200"; d="scan'208";a="347844645" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2023 11:19:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10694"; a="764382790" X-IronPort-AV: E=Sophos;i="5.99,235,1677571200"; d="scan'208";a="764382790" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 28 Apr 2023 11:19:39 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 28 Apr 2023 11:19:39 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 28 Apr 2023 11:19:39 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Fri, 28 Apr 2023 11:19:39 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Fri, 28 Apr 2023 11:19:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=joArSC9v1OV+ms8kuQPRVHwi2vJjUhH8di7NqN7x+Ru/mDJD4Qzy0Vs4/6b4GezslNBbUnAwOZBLc7jDPf6El2dUM+rc9Go5jCSWkWsb9xZ6RfoG4rdOuLROqWLo3j22qNDnfDM5VXm+2AQcXgOVICHD7u+tfUpLpfWtA8DAYAWvjbf303Z48ea8H0Gp40ZkeX+dYqt8fTaYPuTiPOFbr2z9Ty8wFHrXAqFbO6LeLlbN3TCQ4EgiOKuIPxAMBh0LGyUi57epG4kINhAuCTn1eVYkdvcjgZHZklRoXgAZnZxLwCmkE+GzGQcVLcavoZXsjXU2hx+BF5DjEatqEqGZYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ljip0TJxo5QVL6jxHBhUoJ1usWVA739xa8dKsSF/jR0=; b=dIpujq0vRNDNlDanOTmhYtRnR7za9Bl7vwQDW5Eh1UNlJZUNMRKzPGCzO8WlF0D6I0QZqY9nlkVRAw9NQMpEvVGGi3g01VnDz66MyUVexq8qTegezthJB+wx5ACOCArY5aFrbZWp5z5QLVrQuS1k0CgigHIeBShYGg8HkJ3DNIiPQykGLs/itZNa0gIO7vXo+w8ElJSSPreeqc4Jj88UK8tjxqIPU3tgb7tIY2Z6Bz0I/JenfurWGCpgsieGjCjyXaal5BVicd24cVxo1ZIP65UfWyqxx1bXRBOYLIK6aTUvflgOiOkzIzHfSz6oy39Yv/9MvOyQ/USUDWUD6Due+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from BL1PR11MB5953.namprd11.prod.outlook.com (2603:10b6:208:384::12) by MW3PR11MB4588.namprd11.prod.outlook.com (2603:10b6:303:54::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Fri, 28 Apr 2023 18:19:36 +0000 Received: from BL1PR11MB5953.namprd11.prod.outlook.com ([fe80::c378:ebc:8936:7167]) by BL1PR11MB5953.namprd11.prod.outlook.com ([fe80::c378:ebc:8936:7167%7]) with mapi id 15.20.6340.024; Fri, 28 Apr 2023 18:19:36 +0000 Date: Fri, 28 Apr 2023 11:18:30 -0700 From: Radhakrishna Sripada To: Mika Kahola Message-ID: References: <20230428095433.4109054-1-mika.kahola@intel.com> <20230428095433.4109054-2-mika.kahola@intel.com> Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230428095433.4109054-2-mika.kahola@intel.com> X-ClientProxiedBy: BYAPR06CA0019.namprd06.prod.outlook.com (2603:10b6:a03:d4::32) To BL1PR11MB5953.namprd11.prod.outlook.com (2603:10b6:208:384::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL1PR11MB5953:EE_|MW3PR11MB4588:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e0c5a85-a462-4038-c99a-08db48151f14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lkBb5A2UvO/z+l3SfxgCSamHUpEUqTLX9/5tdvjFBvo18kHwnDmkyUXryYM4mWQdPqnpnr+oajpJlf2/zmRsGPpz/nbucl+VEKeNfVpC++SDvoObjh3ku6oCEKXEHsFXvp7T06DdH5ifR6Nq4VACw7WgiOcVMjELCBwHWugAKOc1H3OJd+ikU/UahDBB20O4zt0o6aFjaQtXLGXaITwPX6nnbfUU/tKB2Mo4yJc4U0goHPZD+mkyY60MeSqSkw1yXVaCRlbsT0Ft6+TxJvAMJQzXtpVNjasM0iitLmYNn3YSkSL5YV793taUleP3s1u0t3WHsOLE/Y9vmF26jEdVpB90JWbc8yGyx1GDc4pyLvSazq4TfuqSgQdJemWK7/8sj2wQIOeuhCqL8PEL4fAjJF35pVMKkA03pU6OuhJW6F4iCciwofgeK/UkuhUS/pkit4cM00EwatvSPLOGBb0esWNS9dLjb7g4OB03lTLJWmrjIdFT0Kwy2ZtzElqU0QqTErmnS6OH0ELEMyfKYmgFPAmphytitnJJEEKTAF3qFmfHNs7fDegfTRPqt+br+0WQ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL1PR11MB5953.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(7916004)(376002)(346002)(366004)(39860400002)(136003)(396003)(451199021)(6506007)(9686003)(26005)(6512007)(186003)(66476007)(66556008)(4326008)(82960400001)(5660300002)(41300700001)(66946007)(316002)(6666004)(6486002)(83380400001)(44832011)(6636002)(30864003)(6862004)(2906002)(8936002)(8676002)(478600001)(86362001)(33716001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?4f3VXyqtVrdMI4QmzahIgq40lm6akWm+fCZXvQw+IZiJ6RpUVtMXhw4Xdl?= =?iso-8859-1?Q?oNrYuurZ7YLVcKjLbi5yB941c7fs7ZDN45kzz/m4nkRQ60YpJqCl+WG8Rf?= =?iso-8859-1?Q?WFYjUrcx3h5SfswwXiv3mx6TwJs8qS3Q6+68IuFsQTs+t2l1eg5F/jleah?= =?iso-8859-1?Q?aD+Jj398DFjlvwFmhcVFYQQMRWgbaSC/HBA7RbIEkli+80s+1RlIDYjJPC?= =?iso-8859-1?Q?w6AifAXCRINSryQc9dq6At7awNdcpqi4YMbzlhnwZ4ZtTwbY2vgTuGLeLx?= =?iso-8859-1?Q?kBt/SfETB8uMcNNAb3LZkIUs//ysQgg6ZypVa6MBBvqzuuVFyB0ZaexFDr?= =?iso-8859-1?Q?QsqWx/xtbr52x4WoqEwaFhcXdwlJDrDw+OsqKSSsy8XCVzPIqb+aMA1gK5?= =?iso-8859-1?Q?mxFGoEStVY0FAboHDmMtVztL2sBRuoTZQso572n0KMwnIpHuxwat9Wjz9J?= =?iso-8859-1?Q?fotA9Gn2N7rdJvDOUVux5RSpVwUBLwLtc8+Jdiss/HM68Ew3nK4ksjN6NR?= =?iso-8859-1?Q?RsHAhDpiJEL91NUpd52WI8HjqO7d4qL/l9jJRfuOaluZn4klwwFLWIzp1O?= =?iso-8859-1?Q?Lxiut1vM6FlcxlSR6iKh86TpJ2ZeiDJPDA4T7CaY23EN7lPc/D+qIbM2jt?= =?iso-8859-1?Q?xV+Pmpxxr5WI84/ViWveyxSgR27I0POHWv90XKpVCDDuJnr3zd1pnlYIgJ?= =?iso-8859-1?Q?DkegNciHM2mln8eZOo/GoRdzLwemOI1S+OttimJCi/uOrdAWvXcRoOdeJO?= =?iso-8859-1?Q?b9PNwKL24BZDPe9Hs6M67+7w9i7fUXwR6TY43nDi3iPIpzNdblhRMJPjiM?= =?iso-8859-1?Q?85BjdKkxV5LfAibgSat4y7OpDKXXMQY5LKVQFx7vo0Brl1OgG1wB3Toxj3?= =?iso-8859-1?Q?FlClqNIFXII5ERvwvO3kHpLQXgF3URf6dj0N5y9orCoQUPxqtZULT21KB4?= =?iso-8859-1?Q?BCLkFAV8XhxPTaNOsfKiNayO/oar8VTcYD+yPXDE5lCvjuZEZS6HDqkJHk?= =?iso-8859-1?Q?zVhA07BIBHJTxjFnuVFwJ/hEXa/oHmF/vB5tdriUzBDWzL3ftq5sbEr35W?= =?iso-8859-1?Q?QvLZtxiOtYDXKvisYuP19XsP51xuK8GMKkafctWY3VkQTgJaTvgKoPhKq6?= =?iso-8859-1?Q?Zne3Ax8iTiiuB9giQGHCHxPJvqi7dRMucUxBuYDzAfqSb0Q3r0ykPXYCEd?= =?iso-8859-1?Q?ErsQ8S2HbLOEgErauZGTU4xFTk54EHV+MSSKlIIlGj+natoiNAU/rZCaz7?= =?iso-8859-1?Q?bwysf8bYKd7zvXvCSX4AnxZsHqgHM3perI55lBZDwsSPOUhybQBzNAw947?= =?iso-8859-1?Q?f8ctRzov3CIrH20OC9GOr3LNRn0dmYOxm01KLYacijc8eLdq6+0GbKIoMA?= =?iso-8859-1?Q?z9B9jpCrICngRtrrgrKckofoXnbmcCvt9JSHuxhcOcIm/lFby5/qrCUqou?= =?iso-8859-1?Q?MsRN1YleRXoGzrZYoC3culLXOAZl8C1JczLfGRsBizcf074qo7EsIaDX0i?= =?iso-8859-1?Q?E7rMo5wpuB6iJ5s/ZdTVNaai47KH0v7TrhauZp04KNIhD9cl3NLNNz5mmH?= =?iso-8859-1?Q?iuZ5bd0481pkL2f16GcND1UUVJ9RonRKA20UaNv+lX/Y8JBNHgSeCJwT1P?= =?iso-8859-1?Q?SIqYzgOPU8PUnEzsbgjxGYv807EXZzAJij3yExuDZbhblA8jmdqxD0Idq7?= =?iso-8859-1?Q?4ofabUWtUKmTtWMVdK0=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 8e0c5a85-a462-4038-c99a-08db48151f14 X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5953.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2023 18:19:35.8769 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nERzc5mLsDUon+6qOf1hFgPbaNK1qNKBK+7O/HS0JyLn7WmPZIL6NSd6wpX/ZkWLbqXPluWkl09RZ59KyeW5vVhffdc2JZxgFiFf3S+PiAE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4588 X-OriginatorOrg: intel.com Subject: Re: [Intel-gfx] [PATCH v2 01/13] drm/i915/mtl: C20 PLL programming 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: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Apr 28, 2023 at 12:54:21PM +0300, Mika Kahola wrote: > C20 phy PLL programming sequence for DP, DP2.0, HDMI2.x non-FRL and > HDMI2.x FRL. This enables C20 MPLLA and MPLLB programming sequence. add > 4 lane support for c20. > > v2: Add 6.48Gbps and 6.75Gbps modes for eDP (RK) > Fix lane check (RK) > Fix multiline commenting (Arun) > use usleep_range() instead of msleep() (Andi) > > Reviewed-by: Arun R Murthy LGTM, Reviewed-by: Radhakrishna Sripada > Signed-off-by: José Roberto de Souza > Signed-off-by: Mika Kahola > Signed-off-by: Bhanuprakash Modem > Signed-off-by: Imre Deak > Signed-off-by: Arun R Murthy > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 288 +++++++++++++++--- > .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 33 ++ > drivers/gpu/drm/i915/display/intel_ddi.c | 3 +- > .../drm/i915/display/intel_display_types.h | 15 +- > drivers/gpu/drm/i915/display/intel_dp.c | 12 +- > 5 files changed, 309 insertions(+), 42 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index 83180074b512..71163bc5bbf5 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -273,6 +273,18 @@ static void intel_cx0_write(struct drm_i915_private *i915, enum port port, > __intel_cx0_write(i915, port, lane, addr, data, committed); > } > > +static void intel_c20_sram_write(struct drm_i915_private *i915, enum port port, > + int lane, u16 addr, u16 data) > +{ > + assert_dc_off(i915); > + > + intel_cx0_write(i915, port, lane, PHY_C20_WR_ADDRESS_H, addr >> 8, 0); > + intel_cx0_write(i915, port, lane, PHY_C20_WR_ADDRESS_L, addr & 0xff, 0); > + > + intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_H, data >> 8, 0); > + intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, 1); > +} > + > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > int lane, u16 addr, u8 clear, u8 set, bool committed) > { > @@ -1415,6 +1427,215 @@ void intel_c10pll_dump_hw_state(struct drm_i915_private *i915, > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); > } > > +static bool intel_c20_use_mplla(u32 clock) > +{ > + /* 10G and 20G rates use MPLLA */ > + if (clock == 312500 || clock == 625000) > + return true; > + > + return false; > +} > + > +static u8 intel_c20_get_dp_rate(u32 clock) > +{ > + switch (clock) { > + case 162000: /* 1.62 Gbps DP1.4 */ > + return 0; > + case 270000: /* 2.7 Gbps DP1.4 */ > + return 1; > + case 540000: /* 5.4 Gbps DP 1.4 */ > + return 2; > + case 810000: /* 8.1 Gbps DP1.4 */ > + return 3; > + case 216000: /* 2.16 Gbps eDP */ > + return 4; > + case 243000: /* 2.43 Gbps eDP */ > + return 5; > + case 324000: /* 3.24 Gbps eDP */ > + return 6; > + case 432000: /* 4.32 Gbps eDP */ > + return 7; > + case 312500: /* 10 Gbps DP2.0 */ > + return 8; > + case 421875: /* 13.5 Gbps DP2.0 */ > + return 9; > + case 625000: /* 20 Gbps DP2.0*/ > + return 10; > + case 648000: /* 6.48 Gbps eDP*/ > + return 11; > + case 675000: /* 6.75 Gbps eDP*/ > + return 12; > + default: > + MISSING_CASE(clock); > + return 0; > + } > +} > + > +static u8 intel_c20_get_hdmi_rate(u32 clock) > +{ > + switch (clock) { > + case 25175: > + case 27000: > + case 74250: > + case 148500: > + case 594000: > + return 0; > + case 166670: /* 3 Gbps */ > + case 333330: /* 6 Gbps */ > + case 666670: /* 12 Gbps */ > + return 1; > + case 444440: /* 8 Gbps */ > + return 2; > + case 555560: /* 10 Gbps */ > + return 3; > + default: > + MISSING_CASE(clock); > + return 0; > + } > +} > + > +static bool is_dp2(u32 clock) > +{ > + /* DP2.0 clock rates */ > + if (clock == 312500 || clock == 421875 || clock == 625000) > + return true; > + > + return false; > +} > + > +static bool is_hdmi_frl(u32 clock) > +{ > + switch (clock) { > + case 166670: /* 3 Gbps */ > + case 333330: /* 6 Gbps */ > + case 444440: /* 8 Gbps */ > + case 555560: /* 10 Gbps */ > + case 666670: /* 12 Gbps */ > + return true; > + default: > + return false; > + } > +} > + > +static bool intel_c20_protocol_switch_valid(struct intel_encoder *encoder) > +{ > + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); > + > + /* banks should not be cleared for DPALT/USB4/TBT modes */ > + /* TODO: optimize re-calibration in legacy mode */ > + return intel_tc_port_in_legacy_mode(intel_dig_port); > +} > + > +static int intel_get_c20_custom_width(u32 clock, bool dp) > +{ > + if (dp && is_dp2(clock)) > + return 2; > + else if (is_hdmi_frl(clock)) > + return 1; > + else > + return 0; > +} > + > +static void intel_c20_pll_program(struct drm_i915_private *i915, > + const struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + const struct intel_c20pll_state *pll_state = &crtc_state->cx0pll_state.c20; > + bool dp = false; > + int lane = crtc_state->lane_count > 2 ? INTEL_CX0_BOTH_LANES : INTEL_CX0_LANE0; > + bool cntx; > + int i; > + > + if (intel_crtc_has_dp_encoder(crtc_state)) > + dp = true; > + > + /* 1. Read current context selection */ > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & BIT(0); > + > + /* > + * 2. If there is a protocol switch from HDMI to DP or vice versa, clear > + * the lane #0 MPLLB CAL_DONE_BANK DP2.0 10G and 20G rates enable MPLLA. > + * Protocol switch is only applicable for MPLLA > + */ > + if (intel_c20_protocol_switch_valid(encoder)) { > + for (i = 0; i < 4; i++) > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, RAWLANEAONX_DIG_TX_MPLLB_CAL_DONE_BANK(i), 0); > + usleep_range(4000, 4100); > + } > + > + /* 3. Write SRAM configuration context. If A in use, write configuration to B context */ > + /* 3.1 Tx configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > + if (cntx) > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_TX_CNTX_CFG(i), pll_state->tx[i]); > + else > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_B_TX_CNTX_CFG(i), pll_state->tx[i]); > + } > + > + /* 3.2 common configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > + if (cntx) > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_CMN_CNTX_CFG(i), pll_state->cmn[i]); > + else > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_B_CMN_CNTX_CFG(i), pll_state->cmn[i]); > + } > + > + /* 3.3 mpllb or mplla configuration */ > + if (intel_c20_use_mplla(pll_state->clock)) { > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > + if (cntx) > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_MPLLA_CNTX_CFG(i), > + pll_state->mplla[i]); > + else > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_MPLLA_CNTX_CFG(i), > + pll_state->mplla[i]); > + } > + } else { > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > + if (cntx) > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_MPLLB_CNTX_CFG(i), > + pll_state->mpllb[i]); > + else > + intel_c20_sram_write(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_MPLLB_CNTX_CFG(i), > + pll_state->mpllb[i]); > + } > + } > + > + /* 4. Program custom width to match the link protocol */ > + intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_WIDTH, > + PHY_C20_CUSTOM_WIDTH_MASK, > + PHY_C20_CUSTOM_WIDTH(intel_get_c20_custom_width(pll_state->clock, dp)), > + MB_WRITE_COMMITTED); > + > + /* 5. For DP or 6. For HDMI */ > + if (dp) { > + intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, > + BIT(6) | PHY_C20_CUSTOM_SERDES_MASK, > + BIT(6) | PHY_C20_CUSTOM_SERDES(intel_c20_get_dp_rate(pll_state->clock)), > + MB_WRITE_COMMITTED); > + } else { > + intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, > + BIT(7) | PHY_C20_CUSTOM_SERDES_MASK, > + is_hdmi_frl(pll_state->clock) ? BIT(7) : 0, > + MB_WRITE_COMMITTED); > + > + intel_cx0_write(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C20_VDR_HDMI_RATE, > + intel_c20_get_hdmi_rate(pll_state->clock), > + MB_WRITE_COMMITTED); > + } > + > + /* > + * 7. Write Vendor specific registers to toggle context setting to load > + * the updated programming toggle context bit > + */ > + intel_cx0_rmw(i915, encoder->port, lane, PHY_C20_VDR_CUSTOM_SERDES_RATE, > + BIT(0), cntx ? 0 : 1, MB_WRITE_COMMITTED); > +} > + > int intel_c10pll_calc_port_clock(struct intel_encoder *encoder, > const struct intel_c10pll_state *pll_state) > { > @@ -1456,7 +1677,11 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder, > val |= XELPDP_LANE1_PHY_CLOCK_SELECT; > > val |= XELPDP_FORWARD_CLOCK_UNGATE; > - val |= XELPDP_DDI_CLOCK_SELECT(XELPDP_DDI_CLOCK_SELECT_MAXPCLK); > + > + if (is_hdmi_frl(crtc_state->port_clock)) > + val |= XELPDP_DDI_CLOCK_SELECT(XELPDP_DDI_CLOCK_SELECT_DIV18CLK); > + else > + val |= XELPDP_DDI_CLOCK_SELECT(XELPDP_DDI_CLOCK_SELECT_MAXPCLK); > > /* TODO: HDMI FRL */ > /* TODO: DP2.0 10G and 20G rates enable MPLLA*/ > @@ -1612,7 +1837,7 @@ static void intel_cx0_phy_lane_reset(struct drm_i915_private *i915, enum port po > phy_name(phy), XELPDP_PORT_RESET_END_TIMEOUT); > } > > -static void intel_c10_program_phy_lane(struct drm_i915_private *i915, > +static void intel_cx0_program_phy_lane(struct drm_i915_private *i915, > struct intel_encoder *encoder, int lane_count, > bool lane_reversal) > { > @@ -1620,9 +1845,11 @@ static void intel_c10_program_phy_lane(struct drm_i915_private *i915, > bool dp_alt_mode = intel_tc_port_in_dp_alt_mode(enc_to_dig_port(encoder)); > enum port port = encoder->port; > > - intel_cx0_rmw(i915, port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), > - 0, C10_VDR_CTRL_MSGBUS_ACCESS, > - MB_WRITE_COMMITTED); > + if (intel_is_c10phy(i915, intel_port_to_phy(i915, port))) > + intel_cx0_rmw(i915, port, INTEL_CX0_BOTH_LANES, > + PHY_C10_VDR_CONTROL(1), 0, > + C10_VDR_CTRL_MSGBUS_ACCESS, > + MB_WRITE_COMMITTED); > > /* TODO: DP-alt MFD case where only one PHY lane should be programmed. */ > l0t1 = intel_cx0_read(i915, port, INTEL_CX0_LANE0, PHY_CX0_TX_CONTROL(1, 2)); > @@ -1685,9 +1912,11 @@ static void intel_c10_program_phy_lane(struct drm_i915_private *i915, > intel_cx0_write(i915, port, INTEL_CX0_LANE1, PHY_CX0_TX_CONTROL(2, 2), > l1t2, MB_WRITE_COMMITTED); > > - intel_cx0_rmw(i915, port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1), > - 0, C10_VDR_CTRL_UPDATE_CFG, > - MB_WRITE_COMMITTED); > + if (intel_is_c10phy(i915, intel_port_to_phy(i915, port))) > + intel_cx0_rmw(i915, port, INTEL_CX0_BOTH_LANES, > + PHY_C10_VDR_CONTROL(1), 0, > + C10_VDR_CTRL_UPDATE_CFG, > + MB_WRITE_COMMITTED); > } > > static u32 intel_cx0_get_pclk_pll_request(u8 lane_mask) > @@ -1712,8 +1941,8 @@ static u32 intel_cx0_get_pclk_pll_ack(u8 lane_mask) > return val; > } > > -static void intel_c10pll_enable(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state) > +void intel_cx0pll_enable(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state) > { > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > enum phy phy = intel_port_to_phy(i915, encoder->port); > @@ -1721,6 +1950,7 @@ static void intel_c10pll_enable(struct intel_encoder *encoder, > bool lane_reversal = dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL; > u8 maxpclk_lane = lane_reversal ? INTEL_CX0_LANE1 : > INTEL_CX0_LANE0; > + intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder); > > /* > * 1. Program PORT_CLOCK_CTL REGISTER to configure > @@ -1739,13 +1969,16 @@ static void intel_c10pll_enable(struct intel_encoder *encoder, > CX0_P2_STATE_READY); > > /* 4. Program PHY internal PLL internal registers. */ > - intel_c10_pll_program(i915, crtc_state, encoder); > + if (intel_is_c10phy(i915, phy)) > + intel_c10_pll_program(i915, crtc_state, encoder); > + else > + intel_c20_pll_program(i915, crtc_state, encoder); > > /* > * 5. Program the enabled and disabled owned PHY lane > * transmitters over message bus > */ > - intel_c10_program_phy_lane(i915, encoder, crtc_state->lane_count, lane_reversal); > + intel_cx0_program_phy_lane(i915, encoder, crtc_state->lane_count, lane_reversal); > > /* > * 6. Follow the Display Voltage Frequency Switching - Sequence > @@ -1779,32 +2012,22 @@ static void intel_c10pll_enable(struct intel_encoder *encoder, > * 10. Follow the Display Voltage Frequency Switching Sequence After > * Frequency Change. We handle this step in bxt_set_cdclk(). > */ > -} > - > -void intel_cx0pll_enable(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state) > -{ > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > - enum phy phy = intel_port_to_phy(i915, encoder->port); > - intel_wakeref_t wakeref; > - > - wakeref = intel_cx0_phy_transaction_begin(encoder); > - > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > - intel_c10pll_enable(encoder, crtc_state); > > /* TODO: enable TBT-ALT mode */ > intel_cx0_phy_transaction_end(encoder, wakeref); > } > > -static void intel_c10pll_disable(struct intel_encoder *encoder) > +void intel_cx0pll_disable(struct intel_encoder *encoder) > { > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > enum phy phy = intel_port_to_phy(i915, encoder->port); > + bool is_c10 = intel_is_c10phy(i915, phy); > + intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder); > > /* 1. Change owned PHY lane power to Disable state. */ > intel_cx0_powerdown_change_sequence(i915, encoder->port, INTEL_CX0_BOTH_LANES, > - CX0_P2PG_STATE_DISABLE); > + is_c10 ? CX0_P2PG_STATE_DISABLE : > + CX0_P4PG_STATE_DISABLE); > > /* > * 2. Follow the Display Voltage Frequency Switching Sequence Before > @@ -1842,18 +2065,7 @@ static void intel_c10pll_disable(struct intel_encoder *encoder) > XELPDP_DDI_CLOCK_SELECT_MASK, 0); > intel_de_rmw(i915, XELPDP_PORT_CLOCK_CTL(encoder->port), > XELPDP_FORWARD_CLOCK_UNGATE, 0); > -} > - > -void intel_cx0pll_disable(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > - enum phy phy = intel_port_to_phy(i915, encoder->port); > - intel_wakeref_t wakeref; > > - wakeref = intel_cx0_phy_transaction_begin(encoder); > - > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > - intel_c10pll_disable(encoder); > intel_cx0_phy_transaction_end(encoder, wakeref); > } > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > index 20024622d0eb..3aa334b15eaf 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > @@ -177,4 +177,37 @@ > #define PHY_CX0_TX_CONTROL(tx, control) (0x400 + ((tx) - 1) * 0x200 + (control)) > #define CONTROL2_DISABLE_SINGLE_TX REG_BIT(6) > > +/* C20 Registers */ > +#define PHY_C20_WR_ADDRESS_L 0xC02 > +#define PHY_C20_WR_ADDRESS_H 0xC03 > +#define PHY_C20_WR_DATA_L 0xC04 > +#define PHY_C20_WR_DATA_H 0xC05 > +#define PHY_C20_RD_ADDRESS_L 0xC06 > +#define PHY_C20_RD_ADDRESS_H 0xC07 > +#define PHY_C20_RD_DATA_L 0xC08 > +#define PHY_C20_RD_DATA_H 0xC09 > +#define PHY_C20_VDR_CUSTOM_SERDES_RATE 0xD00 > +#define PHY_C20_VDR_HDMI_RATE 0xD01 > +#define PHY_C20_CONTEXT_TOGGLE REG_BIT8(0) > +#define PHY_C20_CUSTOM_SERDES_MASK REG_GENMASK8(4, 1) > +#define PHY_C20_CUSTOM_SERDES(val) REG_FIELD_PREP8(PHY_C20_CUSTOM_SERDES_MASK, val) > +#define PHY_C20_VDR_CUSTOM_WIDTH 0xD02 > +#define PHY_C20_CUSTOM_WIDTH_MASK REG_GENMASK(1, 0) > +#define PHY_C20_CUSTOM_WIDTH(val) REG_FIELD_PREP8(PHY_C20_CUSTOM_WIDTH_MASK, val) > +#define PHY_C20_A_TX_CNTX_CFG(idx) (0xCF2E - (idx)) > +#define PHY_C20_B_TX_CNTX_CFG(idx) (0xCF2A - (idx)) > +#define PHY_C20_A_CMN_CNTX_CFG(idx) (0xCDAA - (idx)) > +#define PHY_C20_B_CMN_CNTX_CFG(idx) (0xCDA5 - (idx)) > +#define PHY_C20_A_MPLLA_CNTX_CFG(idx) (0xCCF0 - (idx)) > +#define PHY_C20_B_MPLLA_CNTX_CFG(idx) (0xCCE5 - (idx)) > +#define C20_MPLLA_FRACEN REG_BIT(14) > +#define C20_MPLLA_TX_CLK_DIV_MASK REG_GENMASK(10, 8) > +#define PHY_C20_A_MPLLB_CNTX_CFG(idx) (0xCB5A - (idx)) > +#define PHY_C20_B_MPLLB_CNTX_CFG(idx) (0xCB4E - (idx)) > +#define C20_MPLLB_TX_CLK_DIV_MASK REG_GENMASK(15, 13) > +#define C20_MPLLB_FRACEN REG_BIT(13) > +#define C20_MULTIPLIER_MASK REG_GENMASK(11, 0) > + > +#define RAWLANEAONX_DIG_TX_MPLLB_CAL_DONE_BANK(idx) (0x303D + (idx)) > + > #endif /* __INTEL_CX0_REG_DEFS_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 29e4bfab4635..f445f2613adb 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3359,7 +3359,8 @@ void intel_ddi_update_active_dpll(struct intel_atomic_state *state, > struct intel_crtc *slave_crtc; > enum phy phy = intel_port_to_phy(i915, encoder->port); > > - if (!intel_phy_is_tc(i915, phy)) > + /* FIXME: Add MTL pll_mgr */ > + if (DISPLAY_VER(i915) >= 14 || !intel_phy_is_tc(i915, phy)) > return; > > intel_update_active_dpll(state, crtc, encoder); > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 35c260bd1461..99b187f2f4ed 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -996,8 +996,21 @@ struct intel_c10pll_state { > u8 pll[20]; > }; > > +struct intel_c20pll_state { > + u32 clock; /* in kHz */ > + u16 tx[3]; > + u16 cmn[4]; > + union { > + u16 mplla[10]; > + u16 mpllb[11]; > + }; > +}; > + > struct intel_cx0pll_state { > - struct intel_c10pll_state c10; > + union { > + struct intel_c10pll_state c10; > + struct intel_c20pll_state c20; > + }; > bool ssc_enabled; > }; > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 1d28a2560ae0..4361c1ac65c3 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -53,6 +53,7 @@ > #include "intel_combo_phy_regs.h" > #include "intel_connector.h" > #include "intel_crtc.h" > +#include "intel_cx0_phy.h" > #include "intel_ddi.h" > #include "intel_de.h" > #include "intel_display_types.h" > @@ -423,7 +424,14 @@ static int ehl_max_source_rate(struct intel_dp *intel_dp) > > static int mtl_max_source_rate(struct intel_dp *intel_dp) > { > - return intel_dp_is_edp(intel_dp) ? 675000 : 810000; > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > + > + if (intel_is_c10phy(i915, phy)) > + return intel_dp_is_edp(intel_dp) ? 675000 : 810000; > + > + return 2000000; > } > > static int vbt_max_link_rate(struct intel_dp *intel_dp) > @@ -452,7 +460,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) > /* The values must be in increasing order */ > static const int mtl_rates[] = { > 162000, 216000, 243000, 270000, 324000, 432000, 540000, 675000, > - 810000, > + 810000, 1000000, 1350000, 2000000, > }; > static const int icl_rates[] = { > 162000, 216000, 270000, 324000, 432000, 540000, 648000, 810000, > -- > 2.34.1 >