From patchwork Tue Nov 24 09:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1405358 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 4CgJFy11dcz9sVT; Tue, 24 Nov 2020 20:12:54 +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 1khUNV-0005TC-W9; Tue, 24 Nov 2020 09:12:49 +0000 Received: from mail-pf1-f193.google.com ([209.85.210.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khUNJ-0005OD-As for kernel-team@lists.ubuntu.com; Tue, 24 Nov 2020 09:12:37 +0000 Received: by mail-pf1-f193.google.com with SMTP id w187so3368061pfd.5 for ; Tue, 24 Nov 2020 01:12:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TOV485rIDl4fSHL/SNDRba+xejeg42V02zB6p9+h9h0=; b=kHqLB4HZ0U1sFmuK6IohMe8WnnPDJHi7SH7QLxRZe+dTscfE2GclmQUA5BZeOXleFl LDc9xANsp2MANwEePvgaHIGmNk+7iyYsiOLofgQWfZoG4vzYMFzf6WgfzyZrHxkqE2Nt UoBMnkcSo2ua6rVjS/yYp47Crjg0u4KTm3v1Pu0D9dkNomoMvcXm29ZaL/BZs8Dh4jyU NPXwh9xX7UFTECnpktFB9WlHaNU8+XjCbpQiE61Ku8gG4aP0eDQ1GlpXFrxQ8dBRbuNh +30gBnl2OLlZWWrj+VWCebSOYfh0NUxvVWnIxbI17Hs+MPMfiWC5Wgj1KT2AMjcmUlPn ZjxA== X-Gm-Message-State: AOAM532W7isU35y4+pCpt8MBzfDBOPyBy2bTjuQ+D1VeC22LNoOArqvg 5rZEdtHgbBfxXfKIp/GtOC+PPSRYUf3vKA== X-Google-Smtp-Source: ABdhPJyGiixGHSXpz44LUTaIdCtOzMyWOja9PmNfaJvYFA7uQoeNnAQ8FNGDkSWlCeigl8bbjZORbQ== X-Received: by 2002:a17:90a:c687:: with SMTP id n7mr3633763pjt.185.1606209155256; Tue, 24 Nov 2020 01:12:35 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id o18sm5077843pfp.16.2020.11.24.01.12.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 01:12:34 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/15][SRU][U/OEM-5.10] UBUNTU: SAUCE: drm/i915: s/old_crtc_state/crtc_state/ Date: Tue, 24 Nov 2020 17:12:16 +0800 Message-Id: <20201124091230.335132-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201124091230.335132-1-vicamo.yang@canonical.com> References: <20201124091230.335132-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.193; envelope-from=vicamo@gmail.com; helo=mail-pf1-f193.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: Ville Syrjälä BugLink: https://bugs.launchpad.net/bugs/1903969 intel_dp_enable_port() is called during the enable sequence, so there is nothing old about the passed in crtc state. Rename it. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20200929233449.32323-3-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak (cherry picked from commit 95cef532f22286c810a74e1a067ed050b2e951cf https://anongit.freedesktop.org/git/drm-tip.git) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index bf1e9cf1c0f3..2e08a33b7957 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3830,7 +3830,7 @@ g4x_set_link_train(struct intel_dp *intel_dp, } static void intel_dp_enable_port(struct intel_dp *intel_dp, - const struct intel_crtc_state *old_crtc_state) + const struct intel_crtc_state *crtc_state) { struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); @@ -3845,7 +3845,7 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, * fail when the power sequencer is freshly used for this port. */ intel_dp->DP |= DP_PORT_EN; - if (old_crtc_state->has_audio) + if (crtc_state->has_audio) intel_dp->DP |= DP_AUDIO_OUTPUT_ENABLE; intel_de_write(dev_priv, intel_dp->output_reg, intel_dp->DP);