From patchwork Mon Jan 18 14:25:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1428186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=es+KUVuq; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DKDcH5twPz9sVS; Tue, 19 Jan 2021 01:26:23 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l1VU4-0004rv-8d; Mon, 18 Jan 2021 14:26:20 +0000 Received: from mail-pg1-f179.google.com ([209.85.215.179]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l1VU2-0004qC-2L for kernel-team@lists.ubuntu.com; Mon, 18 Jan 2021 14:26:18 +0000 Received: by mail-pg1-f179.google.com with SMTP id 15so11018427pgx.7 for ; Mon, 18 Jan 2021 06:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=St+ZAAy8mAjiyiR0V4Buoe239+I20PA6bXIFvY0iM5M=; b=es+KUVuqbwtueeGnV7fkMgoXWe1CgCu5Kz6f6KeRROQvfwj5/p6yfaT/nafCkCRDqf 0nxcuCf4cF958LkPGAd5uSPk0kmeL1gnvNROxG9Bi8P7nKxAmQrRQgOoQT9iIae20o0y 5tXi/G+9zXh/OiLS2JGVHcN+HYDwHQn1lGTVqbSgi4+k7zi+mQBe5nNjkLLSQQ/AofYA h49axD4/31ygdPbF3RO0ieHMOJoUtX9elo/91h/dgoCd2EG0HcJ8sLi/o/xnsZSGtwP7 nixo5g/1YFckhRvGzd8c6iuv9P1a33USlu6XP9UMdpN8Mz2VmzJB6zikvVYla7Hvgmi1 Bq8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=St+ZAAy8mAjiyiR0V4Buoe239+I20PA6bXIFvY0iM5M=; b=oUQ4JTAIpjo84resRcZVTBGvLGhxDEz8c+0+MhTB+I9JzGyM6+odRzg/3r+9Vwnk85 9WaX7De+CloTqRWLIgTEh7TzSKMQKc7dMIrna1+s3PfckqXjAcDdGDa2fUorTGNnfqFD 1hc60H07EeSsDkX8syoGFLlp3DDDwOBAu/gc24b/NFW6ZvM0wQvXw5YPj5zfxaOzQf5K cB1vILWH97VnlyQ3dutNVDIOmAQUtXuUZasMHLfsnmIxxxSszih8/oaoFt+ZZG0S+xRm FBfRofar5NjIU41u3y8VQeGheh81/dKu0KJrXcRXunNZ0uO22NyxSHWE7wM35bqOZAW/ s02w== X-Gm-Message-State: AOAM531GJtp0rnJnC1jNvnZRRZQ/qEabjQHY6T19WQ6xZl4wN0+lPzNb O56U3ivBbnRjmBcmn2QVas24HV7YZnWC/A== X-Google-Smtp-Source: ABdhPJwrxUp7GijGgo92vIPMUGt4dxF038pGHGnpig5l+nhk+fj1M6jsNytBgeDO7uQpCkaQkReYiQ== X-Received: by 2002:a05:6a00:8d0:b029:1b6:3581:4f41 with SMTP id s16-20020a056a0008d0b02901b635814f41mr9215775pfu.56.1610979975933; Mon, 18 Jan 2021 06:26:15 -0800 (PST) Received: from localhost (61-220-137-34.HINET-IP.hinet.net. [61.220.137.34]) by smtp.gmail.com with ESMTPSA id p3sm16810115pjg.53.2021.01.18.06.26.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 06:26:15 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 03/10][SRU][OEM-5.10] drm/i915/dg1: Don't program PHY_MISC for PHY-C and PHY-D Date: Mon, 18 Jan 2021 22:25:57 +0800 Message-Id: <20210118142604.207243-4-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210118142604.207243-1-acelan.kao@canonical.com> References: <20210118142604.207243-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.179; envelope-from=acelan@gmail.com; helo=mail-pg1-f179.google.com 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: Matt Roper BugLink: https://bugs.launchpad.net/bugs/1909457 The only bit we use in PHY_MISC is DE_IO_COMP_PWR_DOWN, and the bspec details for that bit tell us that it need only be set for PHY-A and PHY-B. It also turns out that there isn't even an instance of the PHY_MISC register for PHY-D on this platform. Let's extend the EHL/RKL logic that conditionally skips PHY_MISC usage to DG1 as well. Bspec: 50107 Cc: Aditya Swarup Cc: Clinton Taylor Signed-off-by: Matt Roper Signed-off-by: Lucas De Marchi Reviewed-by: Anusha Srivatsa Link: https://patchwork.freedesktop.org/patch/msgid/20201007002210.3678024-6-lucas.demarchi@intel.com (cherry picked from commit 0642c2b837495b6c6b60349c0e4e1b4fe2bedc0a) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/gpu/drm/i915/display/intel_combo_phy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c index 157d8c8c605a..07c9fa2fb835 100644 --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c @@ -189,7 +189,8 @@ static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy) * other combo PHY's. */ if (IS_ELKHARTLAKE(i915) || - IS_ROCKETLAKE(i915)) + IS_ROCKETLAKE(i915) || + IS_DG1(i915)) return phy < PHY_C; return true;