From patchwork Tue Feb 22 17:03:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545048 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp13548imn; Tue, 22 Feb 2022 09:03:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXcgr0LgBaK648tkO91QVj0AExm8jdoLUTWeCbr1UeWsIMQkoESh2ecE98i5j5vsdm3CaQ X-Received: by 2002:a05:6a00:21c8:b0:4e1:69f6:1c23 with SMTP id t8-20020a056a0021c800b004e169f61c23mr25970144pfj.8.1645549424014; Tue, 22 Feb 2022 09:03:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645549424; cv=none; d=google.com; s=arc-20160816; b=vhuz7zmFw2ueAtB4WUJ0bwrRuINRCydmDXtRPf+fHgM/pd0V9BE/eHMCGJVAYuZ8ne wokdGW3j+iQQS2zZbsmAnHO9wIyTFZl2xhMc0uHu52VZCJVMyiuxGvvpfjUzKM8m8o3S 8gpRfqQjKV3G3JZoy4IlLeB4me8B8LC5lHJgP22cEsCrm5aEgGxewBYZeAkWkdgjuT6O jgQU5q+XGPRjFy8zCS3QHVBrQDOsfyUcEuQVLN2hlB3ce44LVkrJd1M4FegGtUPorOIX ZwYyrC0yJFJZVp4+aZ36udW57d6BRll5N2727sb62XDSPrynD8u8NDrReixfNX4hEOCh evCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :delivered-to; bh=b4GdysXiey82GL8syogIgM6I42LlqPJgyDXJo5ghHvY=; b=hTF3uw8YXN6bf18w5SOuz6fUaMXeeUv+rSzajQUnjddAqZIxXKGItZg+06U5DY1C3J AD7IEL1340aQEWSIogfE8SMPumQ3OpX+0N2Rua1y4vkDrz1eq/67rph+/P/Tx4NqCJJZ a0JNVIzzm2iAoc3nr0Ei1uEXJl3hBFOOXDLowiMwTHyJ/v73R0hdK/BD3iRbNQthhrIZ Y/YvLBmlxrR5dzgg0psCRvqe2SAH28Mq/EJnkQLW1RKMUfzTgKN8hWjgkaIB7rQh+MgO qFUQCseWjIY5KZ7owF8vNuK7E523oVupCdmczvjdf8twZ2RqUWoNBDLBcJbALaluoXBN 0cNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=Nh8sJNEB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id a73si20900189pge.792.2022.02.22.09.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 09:03:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=Nh8sJNEB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17F5A10E9B4; Tue, 22 Feb 2022 17:03:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4CF910E9B7 for ; Tue, 22 Feb 2022 17:03:39 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 29CD86124B; Tue, 22 Feb 2022 17:03:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F19AEC340E8; Tue, 22 Feb 2022 17:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645549418; bh=J2CURahxnVv8b6eRRfjW/3jnd2IJWphDlftdm3zmD0U=; h=From:To:Cc:Subject:Date:From; b=Nh8sJNEB0hscdsctvswYJN1g1szpTYkym4RdoK060CK+YVjzLAsurKkPxf4Dm6st2 hLhwjMCgn+RNw+DiCEMq6HjvYNlvmL1Inr4I0pwgZDjLOt+Uxo3ZOBpJvbw4BEZq78 v8D6ue4QvVaYSojDKbL5tbD87q7d9vT/VvB6ZPjnAPFcB89mP2Io9VPYIOWkTOcYot k6cMGkTuVms43N76emcqEhJDbN1XxRwic+EtzUvwKuFfxvpJDES17XX2nW3YCDl+/a 1iCJ04Aa3IXymFx+mazzHaBvQhVE/ZvsWtgIbVmXPLZA8Cvha8Yg6iQHinfOgGw5Bs Xgqi2d2YgH27g== From: broonie@kernel.org To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Tue, 22 Feb 2022 17:03:33 +0000 Message-Id: <20220222170333.694165-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Linux Next Mailing List , Linux Kernel Mailing List , Tvrtko Ursulin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commit: c5274e86da5fe ("drm/i915/snps: convert to drm device based logging") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. +++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c @@@ -28,13 -29,13 +29,13 @@@ void intel_snps_phy_wait_for_calibratio enum phy phy; for_each_phy_masked(phy, ~0) { - if (!intel_phy_is_snps(dev_priv, phy)) + if (!intel_phy_is_snps(i915, phy)) continue; - if (intel_de_wait_for_clear(dev_priv, ICL_PHY_MISC(phy), + if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy), DG2_PHY_DP_TX_ACK_MASK, 25)) - DRM_ERROR("SNPS PHY %c failed to calibrate after 25ms.\n", - phy_name(phy)); + drm_err(&i915->drm, "SNPS PHY %c failed to calibrate after 25ms.\n", - phy); ++ phy_name(phy)); } } diff --cc drivers/gpu/drm/i915/display/intel_snps_phy.c index 92ff654f54f56,8573a458811a0..0000000000000 --- a/drivers/gpu/drm/i915/display/intel_snps_phy.c