Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0596C77B7F for ; Mon, 8 May 2023 14:47:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BF6410E2E8; Mon, 8 May 2023 14:47:19 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BF0F10E2E4 for ; Mon, 8 May 2023 14:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683557232; x=1715093232; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CUIjncvsA5m8HNMvXA2EEZP99+fyGphkCvo0mpBbiYc=; b=iEo+6+pShr5Xhm5Zpx8hJUd+9theti1eiJYjs8yIironOcj6SoKpEUzV 2eoyD5xX7oI77D9AIDPzqvhCcn9hBL4Q/RNgRbCS4PYLFwNYg86n836sE KrKNjyYh541hYoVq0YKgozqjq9gALEEtA4jCkXS7yU5Xw+VVDTrlznDDu HJdunGpdGGDWAUVpUnr3GKyiPHHHzPKSyICNW9TaUwFVIin/fFjrVbClT XompznnP4wsyxdodYiVQMYRg4u5PyBnH6xTUzm1dtP0iuSSOX2+MjXqXg Ag8/3HF0q5g0+GRYUfFWbMQgzLiPm2Fye0zBQlJMD9XJHcaQUYUotu4oX w==; X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="352724125" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="352724125" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 07:47:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="731329860" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="731329860" Received: from heid-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.62.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 07:47:09 -0700 From: Jani Nikula To: intel-xe@lists.freedesktop.org Date: Mon, 8 May 2023 17:46:08 +0300 Message-Id: <20230508144618.162140-9-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508144618.162140-1-jani.nikula@intel.com> References: <20230508144618.162140-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 08/18] fixup! drm/i915/display: Add more macros to remove all direct calls to uncore X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Revert "drm/i915/display: Add more macros to remove all direct calls to uncore". Remove the entire commit from history. Move to pcode glue layer. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_de.h | 38 ------------------------- 1 file changed, 38 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h index 22907719bb1e..ab711b2cba12 100644 --- a/drivers/gpu/drm/i915/display/intel_de.h +++ b/drivers/gpu/drm/i915/display/intel_de.h @@ -9,7 +9,6 @@ #include "i915_drv.h" #include "i915_trace.h" #include "intel_uncore.h" -#include "intel_pcode.h" static inline u32 intel_de_read(struct drm_i915_private *i915, i915_reg_t reg) @@ -136,41 +135,4 @@ intel_de_write_notrace(struct drm_i915_private *i915, i915_reg_t reg, u32 val) intel_uncore_write_notrace(&i915->uncore, reg, val); } -static inline void -intel_de_write_samevalue(struct drm_i915_private *i915, i915_reg_t reg) -{ - spin_lock_irq(&i915->uncore.lock); - intel_de_write_fw(i915, reg, intel_de_read_fw(i915, reg)); - spin_unlock_irq(&i915->uncore.lock); -} - -static inline int -intel_de_pcode_write_timeout(struct drm_i915_private *i915, u32 mbox, u32 val, - int fast_timeout_us, int slow_timeout_ms) -{ - return snb_pcode_write_timeout(&i915->uncore, mbox, val, - fast_timeout_us, slow_timeout_ms); -} - -static inline int -intel_de_pcode_write(struct drm_i915_private *i915, u32 mbox, u32 val) -{ - - return snb_pcode_write(&i915->uncore, mbox, val); -} - -static inline int -intel_de_pcode_read(struct drm_i915_private *i915, u32 mbox, u32 *val, u32 *val1) -{ - return snb_pcode_read(&i915->uncore, mbox, val, val1); -} - -static inline int intel_de_pcode_request(struct drm_i915_private *i915, u32 mbox, - u32 request, u32 reply_mask, u32 reply, - int timeout_base_ms) -{ - return skl_pcode_request(&i915->uncore, mbox, request, reply_mask, reply, - timeout_base_ms); -} - #endif /* __INTEL_DE_H__ */ -- 2.39.2