From mboxrd@z Thu Jan 1 00:00:00 1970 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 D0DF7C10F05 for ; Thu, 7 Dec 2023 13:01:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81F9B10E8A5; Thu, 7 Dec 2023 13:01:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B8C410E89F for ; Thu, 7 Dec 2023 13:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701954072; x=1733490072; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+GBf83d6hprNNiPcleJ2FFD0lzgNqzV41G6cWV0OIq8=; b=P5bwqm/J38nw1XaBwq1nQmjakagzkaA8leZY7fiNCB34XW4Q1nt1aD0z r43wXcbO2q5QhEfc7QvqktMxooj9C+C5lBJW9IRe+X+j2+l2SgyxFnF4X v0xzNJfidQ6IhynWEUuaO1gaJWFXnDNQ3o6CQU3slAHDw72LZISQEvhJm jycuRGqE63ts+xp0dNYOtxFPkwHAJuPafjaNgOYmUqveqoYxuPWx7HIeU tzH/2b8j+yUeM0BrYT7S7TsKk2tVuF0B7N1fniZ3kjC4lK6UC3i60moKP Y7mB69NO2N5qcuHZ6WEH4JMQOBNYjFBFDYvU8tE7r8KqzR7nRxUN1kEwe w==; X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="1308987" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="1308987" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 05:01:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="721454213" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="721454213" Received: from rlgreyi-mobl.amr.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.46.17]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 05:01:09 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Subject: [PATCH v2 6/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Date: Thu, 7 Dec 2023 15:00:43 +0200 Message-Id: <20231207130046.2350822-7-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231207130046.2350822-1-jouni.hogander@intel.com> References: <20231207130046.2350822-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit 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: =?UTF-8?q?Jouni=20H=C3=B6gander?= Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" We have now everything to build intel_display.c as it is without any ifdefs. Thus revert local changes from intel_display.c. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_display.c | 35 -------------------- 1 file changed, 35 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 5069b31bf1b7..c3a3a4c3b363 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -42,10 +42,8 @@ #include #include -#ifdef I915 #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_object.h" -#endif #include "g4x_dp.h" #include "g4x_hdmi.h" @@ -7095,39 +7093,6 @@ static void intel_atomic_cleanup_work(struct work_struct *work) intel_atomic_helper_free_state(i915); } -#ifndef I915 -static int i915_gem_object_read_from_page(struct xe_bo *bo, - u32 ofs, u64 *ptr, u32 size) -{ - struct ttm_bo_kmap_obj map; - void *virtual; - bool is_iomem; - int ret; - - XE_WARN_ON(size != 8); - - ret = xe_bo_lock(bo, true); - if (ret) - return ret; - - ret = ttm_bo_kmap(&bo->ttm, ofs >> PAGE_SHIFT, 1, &map); - if (ret) - goto out_unlock; - - ofs &= ~PAGE_MASK; - virtual = ttm_kmap_obj_virtual(&map, &is_iomem); - if (is_iomem) - *ptr = readq((void __iomem *)(virtual + ofs)); - else - *ptr = *(u64 *)(virtual + ofs); - - ttm_bo_kunmap(&map); -out_unlock: - xe_bo_unlock(bo); - return ret; -} -#endif - static void intel_atomic_prepare_plane_clear_colors(struct intel_atomic_state *state) { struct drm_i915_private *i915 = to_i915(state->base.dev); -- 2.34.1