From patchwork Wed Apr 22 07:04:14 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: 1274772 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 496Wdc4GRTz9sSK; Wed, 22 Apr 2020 17:04:36 +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 1jR9Qv-0008OT-5Z; Wed, 22 Apr 2020 07:04:33 +0000 Received: from mail-pf1-f179.google.com ([209.85.210.179]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jR9Qs-0008Mt-Lc for kernel-team@lists.ubuntu.com; Wed, 22 Apr 2020 07:04:30 +0000 Received: by mail-pf1-f179.google.com with SMTP id w65so597591pfc.12 for ; Wed, 22 Apr 2020 00:04:30 -0700 (PDT) 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=n8N9DHalym26nQTTo6PyR3R5DB4W0/B1xrTr2h85hFI=; b=lPjXpGHOHJivAESLCSPjwKYszylQOgHbEVpq3e//T0vrfCnVW6h0eS8fIqJ1qacuqY 871rpo/86NdAMsXh/LB+HHekS/VbbD12gGrms2HdGNWQGzudsauaCXhw6c9L3ijo140S 6OPC4wiKi1yMFK6rjvts4tOX0MWViox1f68WOqCommT00d3z45Xga70k4A2JIcjL1dLY RjX5KYtSUtby6nAzKBfcpxLolBF/+9VIuupou0yIQfH5QtUCG3GCtu33oPP60ekub7FO 8yfd91f1qmydLADN56Y6xmIE0VkWzfCN3ihKgCDsjQsi9dvXlIwRxtYzIzstnuWDSI3D EVzQ== X-Gm-Message-State: AGi0Pua3BHzgMfFSslmTSuJYh6tc0Ao0K/pkvHdKyqdWNRB0pPryxz7l sFpBCtJ4kTe9O7RnVxARgHupEetEiiY= X-Google-Smtp-Source: APiQypLuDqzGPYDXfF+RW2r/ZQFpMpLEPux8XklASPJApBU72TRaLbsBKqA4dFJkm7XGX6Aqw/7uhw== X-Received: by 2002:aa7:9302:: with SMTP id 2mr25319905pfj.256.1587539068766; Wed, 22 Apr 2020 00:04:28 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id o15sm4188193pgj.60.2020.04.22.00.04.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 00:04:27 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][U][PATCH 2/8] drm/i915/display: Add intel_legacy_aux_to_power_domain() Date: Wed, 22 Apr 2020 15:04:14 +0800 Message-Id: <20200422070420.816972-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200422070420.816972-1-vicamo.yang@canonical.com> References: <20200422070420.816972-1-vicamo.yang@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: José Roberto de Souza BugLink: https://bugs.launchpad.net/bugs/1868936 This is a similar function to intel_aux_power_domain() but it do not care about TBT ports, this will be needed by ICL TC sequences. v2: - renamed to intel_legacy_aux_to_power_domain() Cc: Imre Deak Cc: Cooper Chiou Cc: Kai-Heng Feng Reviewed-by: Imre Deak Tested-by: You-Sheng Yang Signed-off-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20200414194956.164323-2-jose.souza@intel.com (cherry picked from drm-tip commit dba6b0b4eab362a886db616ee38c1d624914d98b) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++++++++-- drivers/gpu/drm/i915/display/intel_display.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index aa453953908b..4c6f9e1628f3 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7212,7 +7212,17 @@ intel_aux_power_domain(struct intel_digital_port *dig_port) } } - switch (dig_port->aux_ch) { + return intel_legacy_aux_to_power_domain(dig_port->aux_ch); +} + +/* + * Converts aux_ch to power_domain without caring about TBT ports for that use + * intel_aux_power_domain() + */ +enum intel_display_power_domain +intel_legacy_aux_to_power_domain(enum aux_ch aux_ch) +{ + switch (aux_ch) { case AUX_CH_A: return POWER_DOMAIN_AUX_A; case AUX_CH_B: @@ -7228,7 +7238,7 @@ intel_aux_power_domain(struct intel_digital_port *dig_port) case AUX_CH_G: return POWER_DOMAIN_AUX_G; default: - MISSING_CASE(dig_port->aux_ch); + MISSING_CASE(aux_ch); return POWER_DOMAIN_AUX_A; } } diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 028aab728514..dd1215106d4a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -572,6 +572,8 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state); enum intel_display_power_domain intel_port_to_power_domain(enum port port); enum intel_display_power_domain intel_aux_power_domain(struct intel_digital_port *dig_port); +enum intel_display_power_domain +intel_legacy_aux_to_power_domain(enum aux_ch aux_ch); void intel_mode_from_pipe_config(struct drm_display_mode *mode, struct intel_crtc_state *pipe_config); void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,