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 179E4C4167B for ; Thu, 7 Dec 2023 15:58:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D527810E91E; Thu, 7 Dec 2023 15:58:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DA2D10E919 for ; Thu, 7 Dec 2023 15:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701964708; x=1733500708; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=g0nEOn9UqStDhNgqF2Kzgv03M+DIFiOBOXlLHv1hNuI=; b=IARGSxc45QKQZ/Ydts7x5EwW9S7oPfPZUPm2KUcikSgBo7UHTPIOPLf4 rcIfIB/5TUNzBvpgJI1o14uqXpSo2WtxQvfJmOY9GRCvvLpzmA+noJFiI 3WPpvzaDvneiWeFMxSAo7dmQ7YAPwYkwykE5kIbz6OViQoKzsBvLuKdKt vmhY1VOYsCo1IRq/P6DW0r915HTmART8OLR1cG4VvePZp49ZoomyyRQBJ n9GUJKrsnmWbIWXW74LNIerqNz4AFXnZnCOJNiUZRqEyhrzRG2xUVEj2J 9JvPwV1DCUz0HyEnyXRxTygXDzRM5vmmkMB5/OAN56uB2iCuXmXNg3oDi g==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384655277" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="384655277" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 07:58:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765151648" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="765151648" Received: from rlgreyi-mobl.amr.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.46.17]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 07:58:25 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Subject: [PATCH v6 0/9] Intel_fb.c refactoring Date: Thu, 7 Dec 2023 17:58:06 +0200 Message-Id: <20231207155815.2467082-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 patch set is refactoring intel_fb.c code to get rid of ifdefs. This is done by splitting i915 and Xe specific parts from intel_fb.c into their own source files. Some ifdefs are tackled by adding definitions into Xe compatibility headers. v6: - Patch 7. is now backported v5: - s/user_mode_cmd/mode_cmd - Fix typo intel_fb vs. intel_fb_bo v4: Empty function instead of define v3: - intel_fb_bo_framebuffer_fini added - xe_bo_get/put and unpin moved to intel_fb_bo_framebuffer_init/fini v2: i915 changes are now backported Cc: Maarten Lankhorst Cc: Rodrigo Vivi Cc: Jani Nikula Jouni Högander (9): Revert "FIXME: drm/i915: xe intel_fb.c framebuffer init and destroy xe changes" fixup! FIXME: drm/i915/display: Remaining changes to make xe compile drm/i915/display: use intel_bo_to_drm_bo in intel_fb.c drm/i915/display: Convert intel_fb_modifier_to_tiling as non-static drm/i915/display: Handle invalid fb_modifier in intel_fb_modifier_to_tiling drm/i915/display: Split i915 specific code away from intel_fb.c drm/i915/display: Add intel_fb_bo_framebuffer_fini fixup! drm/xe/display: Implement display support fixup! drm/xe/display: Implement display support drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_fb.c | 247 +++++------------- drivers/gpu/drm/i915/display/intel_fb.h | 2 + drivers/gpu/drm/i915/display/intel_fb_bo.c | 97 +++++++ drivers/gpu/drm/i915/display/intel_fb_bo.h | 26 ++ drivers/gpu/drm/xe/Makefile | 1 + .../compat-i915-headers/gem/i915_gem_object.h | 16 ++ drivers/gpu/drm/xe/display/intel_fb_bo.c | 74 ++++++ drivers/gpu/drm/xe/display/intel_fb_bo.h | 24 ++ 9 files changed, 305 insertions(+), 183 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_fb_bo.c create mode 100644 drivers/gpu/drm/i915/display/intel_fb_bo.h create mode 100644 drivers/gpu/drm/xe/display/intel_fb_bo.c create mode 100644 drivers/gpu/drm/xe/display/intel_fb_bo.h -- 2.34.1