From patchwork Tue May 10 14:08:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1629181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ARfYUQOO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KyKfC5GpKz9sGh for ; Wed, 11 May 2022 00:09:06 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1noQXs-0004S1-NY; Tue, 10 May 2022 14:09:00 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1noQXp-0004Rf-P0 for kernel-team@lists.ubuntu.com; Tue, 10 May 2022 14:08:57 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 33E1B3F1B4 for ; Tue, 10 May 2022 14:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652191737; bh=qkdIbtlpjakWX17OMttlj3Qd8xZ4mOlrgyMCDaquPGU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ARfYUQOOoAKEfHWPuh6+EHm+jEH7fcqttYiXLSKns8xdTxESOpEjFMlbzhhRWB7YE auOpnlLyGlOJjxcp/U4Dod9cJn25onWMtbBxJgH6GZ43u/VBUTYkItwe7YncmVWVh/ LZZFIAW6Ya/4MyQfiUpBbcySTzEZeyjSNcmslowetcvCwupxn64NItZjTTmofPQgmI IE9s1p9Z5atg329gSjUz9EZlfl9ErfofizaXgCOAIhFK7dcXAz/c/8Yv9AhpNmYuCD aaHiYbCp55zw4p+Au21N4V67qsH1eizcxMPoobLTIOOpTXWZ66LijbWaVWwF7OSHyq IUCslhZxT8Guw== Received: by mail-pj1-f71.google.com with SMTP id t15-20020a17090a3b4f00b001d67e27715dso1377087pjf.0 for ; Tue, 10 May 2022 07:08:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qkdIbtlpjakWX17OMttlj3Qd8xZ4mOlrgyMCDaquPGU=; b=4MBt08YuqdwJIMpbSbP1CW6WMHk0xBapXZOW7c4HF7/BVdmqU0v948rz4vv1X383v2 RZPghCjfm6KRwO5RvPHhNc+yf8G+M18rN+XTC+bR5LfvJ6BlBUvQiZCkLplPvZDm4YEM KCnh6qFKbQ4XB800daKaHypqLJEGQ4TdIlKeSAqZyPedPOUEO2Q5k6O0rdcNzYAp0boJ JdvJHywp+lWz5JTpD1RB6yx3DsGkpbg9m3py7+U8A+e6YgBh41+F9oWtJvPMNzughd0U zgLWtDdHAROwRvK9B4NAez+DLU49RtqvKyPk5k24bomNq1VtXlZFe8KRBeuItf5r2RFc PyUA== X-Gm-Message-State: AOAM532av14QOSUgarnJ1xgzYCs6VnC1hycw9/9YWbZnuInSJ8ebdpf0 nyk1EkndiFyZAJrSiqq9kDtt2aAh5aEgAjHFj19DLUHqdlTILiAgtIbPG35UsT5c1OWuFmrCUys 413Am182BPx0de65QAOmoWdFfkiYzzLhJG7pghO53cA== X-Received: by 2002:a63:1862:0:b0:3ab:224c:fef4 with SMTP id 34-20020a631862000000b003ab224cfef4mr17578313pgy.149.1652191735690; Tue, 10 May 2022 07:08:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPsxwkcqdwuqaz2CZBkBjms3jeGCxkAUF6wv0ZJANTFTGDXQD/R5GEczsirhqxGEpiOLlm4g== X-Received: by 2002:a63:1862:0:b0:3ab:224c:fef4 with SMTP id 34-20020a631862000000b003ab224cfef4mr17578293pgy.149.1652191735410; Tue, 10 May 2022 07:08:55 -0700 (PDT) Received: from localhost.localdomain (36-230-106-94.dynamic-ip.hinet.net. [36.230.106.94]) by smtp.gmail.com with ESMTPSA id e18-20020aa798d2000000b0050dc762816csm10731632pfm.70.2022.05.10.07.08.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 07:08:54 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 1/1] drm/i915/gt: Restrict the GT clock override to just Icelake Date: Tue, 10 May 2022 22:08:10 +0800 Message-Id: <20220510140810.137952-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220510140810.137952-1-jianhui.lee@canonical.com> References: <20220510140810.137952-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Chris Wilson BugLink: https://bugs.launchpad.net/bugs/1945462 It appears that Elkhart Lake uses the same clock for CTX_TIMESTAMP as CS_TIMESTAMP, leaving Icelake as the odd one out. This patch was originated from https://patchwork.freedesktop.org/patch/416618/?series=86446 Signed-off-by: Alex Hung Signed-off-by: Anthony Wong Signed-off-by: Wen-chien Jesse Sung (cherry picked from commit 939eb19a15aa195fb539d2aab115d811d74ffdf6 linux-intel-5.13) Signed-off-by: Jian Hui Lee --- drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c index 3513d6f90747..1c06bf3d63cd 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c @@ -159,6 +159,10 @@ void intel_gt_init_clock_frequency(struct intel_gt *gt) if (gt->clock_frequency) gt->clock_period_ns = intel_gt_clock_interval_to_ns(gt, 1); + /* Icelake appears to use another fixed frequency for CTX_TIMESTAMP */ + if (IS_ICELAKE(gt->i915)) + gt->clock_period_ns = NSEC_PER_SEC / 13750000; + GT_TRACE(gt, "Using clock frequency: %dkHz, period: %dns, wrap: %lldms\n", gt->clock_frequency / 1000,