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 509C1C7EE23 for ; Tue, 30 May 2023 12:52:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2840910E0A3; Tue, 30 May 2023 12:52:35 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46A3210E0A3 for ; Tue, 30 May 2023 12:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685451153; x=1716987153; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=or42FG3BcUTtYWru9g4Ab+DO/YAMiXZQldMUhyftEO8=; b=DN8cNaYHY8jW6heMfwfutv56Z6mGA5SQampIjfOzY4Ohm7DVHNfa6boT 3gZZav25VpvIzRbwlG7meNxcKv6XaRqkrIZvWqp7SkwT/+IBv0zjEch6J QXhL86mO0UN8pHUkitdzY7/IT5kINnTO+NBrN3Zo0f0HIg4/uLU18NOHv 84SCMv8GT/kHGHhbkYs12rc6dO5IOh4jyg7IAc1s6f1md55hq+wdaG0Gl 2ms83wkDZ1NoRskCfVjrUg8kcOSraqt/ZAGBBUxc5jBNWG0SSiLjP6FMu 0JHS10SJtRNYjS+XfzEAOpo8glR6xIGwcAh5BYiIu4bDdwZYsFIxlldSM w==; X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="418388055" X-IronPort-AV: E=Sophos;i="6.00,204,1681196400"; d="scan'208";a="418388055" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 05:52:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="656842495" X-IronPort-AV: E=Sophos;i="6.00,204,1681196400"; d="scan'208";a="656842495" Received: from kleve-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.47.8]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 05:52:12 -0700 From: Jani Nikula To: Jouni =?utf-8?Q?H=C3=B6gander?= , intel-xe@lists.freedesktop.org In-Reply-To: <20230530104713.2570554-1-jouni.hogander@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230530104713.2570554-1-jouni.hogander@intel.com> Date: Tue, 30 May 2023 15:52:09 +0300 Message-ID: <87fs7egex2.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-xe] [PATCH v2 0/9] Clean-up Xe FBC additions 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: Jouni =?utf-8?Q?H=C3=B6gander?= , Rodrigo Vivi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Tue, 30 May 2023, Jouni H=C3=B6gander wrote: > This patch set cleans up Xe FBC additions. All stolen memory details are > moved to i915_gem_stolen header and source files. Also some fence handling > details are move away from FBC code. This allows removing all ifdefs added > into fbc code. I think all the #ifdef removals should be fixups to "drm/i915/display: Remaining changes to make xe compile". Basically my idea is that the above commit should be reduced to minimal or non-existent; the remaining or required ifdefs should be added per feature on a commit by commit basis, not in one big lump. BR, Jani. > > v2: add missing intel_gt_types.h header > > Cc: Jani Nikula > Cc: Maarten Lankhorst > Cc: Rodrigo Vivi > > Jouni H=C3=B6gander (9): > fixup! drm/i915/display: Implement FBC support > drivers/xe: Add new type for compressed fb > drm/i915/fbc: Add common type for compressed fb to avoid ifdefs > drm/xe: Add i915_gem.h compatibility header > drivers/xe: Move Xe stolen memory handling away form fbc code > drm/i915: Move stolen memory handling into i915_gem_stolen > drm/i915/fbc: Stolen initialize can be checked in plane check for i915 > as well > drm/i915/fbc: Add function to get number of fences for gt > Add new fence_id and fence count functions > > drivers/gpu/drm/i915/display/intel_fbc.c | 134 ++++-------------- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 37 +++++ > drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 13 ++ > drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 + > drivers/gpu/drm/i915/i915_vma.h | 5 + > .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 5 + > .../gpu/drm/xe/compat-i915-headers/i915_gem.h | 9 ++ > .../xe/compat-i915-headers/i915_gem_stolen.h | 76 ++++++++++ > .../gpu/drm/xe/compat-i915-headers/i915_vma.h | 2 + > .../xe/compat-i915-headers/intel_gt_types.h | 11 ++ > drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 8 ++ > drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h | 1 + > 12 files changed, 194 insertions(+), 109 deletions(-) > create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h > create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stole= n.h > create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_gt_types= .h --=20 Jani Nikula, Intel Open Source Graphics Center