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 547C5C4167B for ; Thu, 7 Dec 2023 13:01:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 15FB710E06A; Thu, 7 Dec 2023 13:01:06 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 342B710E06A for ; Thu, 7 Dec 2023 13:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701954064; x=1733490064; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JLSxv8Br4l0ZsntH5MTvvFuiaQ0sky5fTMwJyHdy3DU=; b=GKS/RMTLGcbSaz+Wk+FG8NZxKhQ2pLncuxWQvwwblOUm8j0QFefzS9zs cX593oOssoz8Wunm+IbeBHvMWel4hkz+yhrERukThhAARMrlMuL8bY+Fl lSDd3M7PVCVmpRKxHpEbkWsOdJQcrvEOpVEMxxCWG1x/Lipse3AgtUWjL DPG9uTij6b2nagM7bbo2gg1+dydxvf1ZQPx36IV6x5aVgYshOBhT31vZE Gy5aHT/RzTnpevlva7TtNlUEuya908q0Aq2JoPfBXsA2W1ouTgYq8tn4E ly+9GU6aqEUdYuiFIAVYWdU+EENojrUsEk8QWjNTVPk/NqC/5RpB9UjWb A==; X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="1308951" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="1308951" 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:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="721454164" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="721454164" 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:00:59 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Subject: [PATCH v2 0/9] Handle remaining ifdefs in hack patch Date: Thu, 7 Dec 2023 15:00:37 +0200 Message-Id: <20231207130046.2350822-1-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 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?= , Jani Nikula , Rodrigo Vivi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" This is removing rest of the ifdefs added by hack patch "drm/i915/display: Remaining changes to make xe compile" after intel_fb.c refactoring set is merged (still under work): https://patchwork.freedesktop.org/series/126505/ Many patches are identical with earlier set from Maarten Lankhorst . They are just a reordered and split a bit more to make more clear what is changed and why: https://patchwork.freedesktop.org/series/125685/ Patch 2. is a backport from i915 driver tree. Cc: Maarten Lankhorst Cc: Jani Nikula Cc: Rodrigo Vivi Cc: Uma Shankar Jouni Högander (8): fixup! FIXME: drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support fixup! drm/xe/display: Implement display support fixup! drm/xe/display: Implement display support fixup! FIXME: drm/i915/display: Remaining changes to make xe compile fixup! FIXME: drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Maarten Lankhorst (1): drm/i915/display: Use i915_gem_object_get_dma_address to get dma address drivers/gpu/drm/i915/display/intel_cursor.c | 12 +++--- drivers/gpu/drm/i915/display/intel_display.c | 35 ---------------- .../drm/i915/display/intel_display_types.h | 4 -- .../drm/i915/display/skl_universal_plane.c | 4 -- .../compat-i915-headers/gem/i915_gem_lmem.h | 1 + .../compat-i915-headers/gem/i915_gem_object.h | 40 +++++++++++++++++++ .../gpu/drm/xe/compat-i915-headers/i915_vma.h | 6 +++ 7 files changed, 53 insertions(+), 49 deletions(-) create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h -- 2.34.1