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 1B5ADC3DA4B for ; Thu, 11 Jul 2024 09:13:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50EB010E9BE; Thu, 11 Jul 2024 09:13:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GI8Pa9BT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id B467E10E9B8 for ; Thu, 11 Jul 2024 09:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720689224; x=1752225224; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pBCjVC5VJuKKh7VR8/dCkPGm5e8HR8BhCDwZ3lQKPac=; b=GI8Pa9BTNNFwyOcrvBJ1fllKyIH90LImkEoBTzx4JGDrni+dSFpv1HE1 2iybupVGgVpLyvLC8LMlo+iymgmj66gLAKU3gZLxTrbFg32xE8U/MukpS L8CZXcIpVLEOP+2GxDID6aPnHQq1j+ru3imRf4hXEsLs2zzGExu84Fpzn LYU6zcC3P8UmcyWvn1+XS6WGPpUPdEjQfYHVcIA0V0V/PNpoGVGyu8DEp WNMeTHapgblPEvzY38vN4CIjQKDjxTqgXdE0kae4z7xmV/c86x0SX8wMk 81aCxI3hLQfdHe3DVDrphkR8wF1C9enyJtLizSnD9dLRH4hUP3wT54kV9 A==; X-CSE-ConnectionGUID: 4i/uxcQdRSaB7/ev0Nl2gg== X-CSE-MsgGUID: 8oB/1rGRTrSjVtN6DINvgA== X-IronPort-AV: E=McAfee;i="6700,10204,11129"; a="12495469" X-IronPort-AV: E=Sophos;i="6.09,199,1716274800"; d="scan'208";a="12495469" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP; 11 Jul 2024 02:09:36 -0700 X-CSE-ConnectionGUID: cy77OUrrTlO6/2hUOslupg== X-CSE-MsgGUID: 21ZOVWcxQ4OTHw9hoV2PUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,199,1716274800"; d="scan'208";a="48467827" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.210]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2024 02:09:35 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Matthew Auld , Rodrigo Vivi Subject: [PATCH v3 1/3] drm/xe: Separate 64K physical allocation for display Date: Thu, 11 Jul 2024 11:09:23 +0200 Message-Id: <20240711090925.179366-2-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240711090925.179366-1-zbigniew.kempczynski@intel.com> References: <20240711090925.179366-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" In case Tile4 + compression Battlemage requires physical 64K pages for allocating display framebuffer. Add flag which distincts buffer created for scanout from other buffers which don't need this restriction. Signed-off-by: Zbigniew Kempczyński Cc: Matthew Auld Cc: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_bo.c | 9 +++++++-- drivers/gpu/drm/xe/xe_device_types.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 31192d983d9e..fbcf77698bf1 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -1984,9 +1984,13 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data, if (args->flags & DRM_XE_GEM_CREATE_FLAG_DEFER_BACKING) bo_flags |= XE_BO_FLAG_DEFER_BACKING; - if (args->flags & DRM_XE_GEM_CREATE_FLAG_SCANOUT) + if (args->flags & DRM_XE_GEM_CREATE_FLAG_SCANOUT) { bo_flags |= XE_BO_FLAG_SCANOUT; + if (xe->info.vram_flags & XE_VRAM_FLAGS_DISPLAY_NEED64K) + bo_flags |= XE_BO_NEEDS_64K; + } + bo_flags |= args->placement << (ffs(XE_BO_FLAG_SYSTEM) - 1); if (args->flags & DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM) { @@ -2315,8 +2319,9 @@ int xe_bo_dumb_create(struct drm_file *file_priv, uint32_t handle; int cpp = DIV_ROUND_UP(args->bpp, 8); int err; + u8 flags_64k = XE_VRAM_FLAGS_NEED64K | XE_VRAM_FLAGS_DISPLAY_NEED64K; u32 page_size = max_t(u32, PAGE_SIZE, - xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K); + xe->info.vram_flags & flags_64k ? SZ_64K : SZ_4K); args->pitch = ALIGN(args->width * cpp, 64); args->size = ALIGN(mul_u32_u32(args->pitch, args->height), diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index f0cf9020e463..386faaffac53 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -46,6 +46,7 @@ struct xe_pat_ops; #define HAS_HECI_GSCFI(xe) ((xe)->info.has_heci_gscfi) #define XE_VRAM_FLAGS_NEED64K BIT(0) +#define XE_VRAM_FLAGS_DISPLAY_NEED64K BIT(1) #define XE_GT0 0 #define XE_GT1 1 -- 2.34.1