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 9AAD8C4167B for ; Tue, 14 Nov 2023 13:05:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6686610E202; Tue, 14 Nov 2023 13:05:08 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03CDC10E214 for ; Tue, 14 Nov 2023 13:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699967106; x=1731503106; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/ALK0UGeQtZ5OTLSAEGHGJ+XR+S/LqxF0kKLwZFhP9A=; b=OuAb3fAj5zWl0Ctwj2w/EFdDsMVd2n0nREsLl+VHjLFMQ4qoVWj49yBb XFo6kvjhdgmMSpWLGuoi0ImfxoIneG43kj4vDctowrK0i81YxIe6wVt25 wQfyp+rAaCSJSlWuTERMvl1WBt1XMoOrnE+SKAImKS5L6m9g8TX6yyAaC VLpuEt9+eeN6zTgGGmzTB4jkBv6Oo4/o7bAkEdfJ1xxMkTovZo1b5YOlK QzSeSOW63O+hheCWcCyNZUwv6xs2fTOXuTlmWYuatsGdGAX50iKSLijpz yN6RM+2ZjbRjoMuF0v+O01OZRROy6yR1vdn9LINKRGmfS4pvuVy+QHXHl w==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="394565350" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="394565350" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 05:05:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="793778913" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="793778913" Received: from mmaiores-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.56.172]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 05:05:05 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Tue, 14 Nov 2023 15:04:35 +0200 Message-Id: <20231114130443.2503708-2-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114130443.2503708-1-jouni.hogander@intel.com> References: <20231114130443.2503708-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 Subject: [Intel-xe] [PATCH v2 1/9] Revert "FIXME: drm/i915/display: Allow fbdev to allocate stolen memory" 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" This reverts commit a3cd4a944a2dcd58a46a7e62d834fbdbbd4e49ed. This FIXME patch can be now reverted as we are about to introduce common and xe/i915 implementation without ifdefs. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_fbdev.c | 48 ++++++++-------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index b7976706bc68..28b9aa9d52c2 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -48,7 +48,6 @@ #include "gem/i915_gem_mman.h" #else #include "xe_gt.h" -#include "xe_ttm_stolen_mgr.h" #endif #include "i915_drv.h" @@ -193,8 +192,8 @@ static int intelfb_alloc(struct drm_fb_helper *helper, size = mode_cmd.pitches[0] * mode_cmd.height; size = PAGE_ALIGN(size); - obj = ERR_PTR(-ENODEV); #ifdef I915 + obj = ERR_PTR(-ENODEV); if (HAS_LMEM(dev_priv)) { obj = i915_gem_object_create_lmem(dev_priv, size, I915_BO_ALLOC_CONTIGUOUS | @@ -213,23 +212,11 @@ static int intelfb_alloc(struct drm_fb_helper *helper, obj = i915_gem_object_create_shmem(dev_priv, size); } #else - if (!IS_DGFX(dev_priv)) { - obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv), - NULL, size, - ttm_bo_type_kernel, XE_BO_SCANOUT_BIT | - XE_BO_CREATE_STOLEN_BIT | - XE_BO_CREATE_PINNED_BIT); - if (!IS_ERR(obj)) - drm_info(&dev_priv->drm, "Allocated fbdev into stolen\n"); - else - drm_info(&dev_priv->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj)); - } - if (IS_ERR(obj)) { - obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv), NULL, size, - ttm_bo_type_kernel, XE_BO_SCANOUT_BIT | - XE_BO_CREATE_VRAM_IF_DGFX(xe_device_get_root_tile(dev_priv)) | - XE_BO_CREATE_PINNED_BIT); - } + /* XXX: Care about stolen? */ + obj = xe_bo_create_pin_map(dev_priv, to_gt(dev_priv), NULL, size, + ttm_bo_type_kernel, + XE_BO_CREATE_VRAM_IF_DGFX(to_gt(dev_priv)) | + XE_BO_CREATE_PINNED_BIT | XE_BO_SCANOUT_BIT); #endif if (IS_ERR(obj)) { @@ -365,23 +352,24 @@ static int intelfb_create(struct drm_fb_helper *helper, } #else - if (!(obj->flags & XE_BO_CREATE_SYSTEM_BIT)) { - if (obj->flags & XE_BO_CREATE_STOLEN_BIT) - info->fix.smem_start = xe_ttm_stolen_io_offset(obj, 0); - else - info->fix.smem_start = - pci_resource_start(pdev, 2) + - xe_bo_addr(obj, 0, XE_PAGE_SIZE); + /* XXX: Could be pure fiction.. */ + if (obj->flags & XE_BO_CREATE_VRAM0_BIT) { + struct xe_gt *gt = to_gt(dev_priv); + bool lmem; + info->fix.smem_start = + (unsigned long)(gt->mem.vram.io_start + xe_bo_addr(obj, 0, 4096, &lmem)); info->fix.smem_len = obj->ttm.base.size; + } else { - /* XXX: Pure fiction, as the BO may not be physically accessible.. */ - info->fix.smem_start = 0; + struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev); + + info->fix.smem_start = pci_resource_start(pdev, 2) + xe_bo_ggtt_addr(obj); info->fix.smem_len = obj->ttm.base.size; } - XE_WARN_ON(iosys_map_is_null(&obj->vmap)); - vaddr = obj->vmap.vaddr_iomem; + /* TODO: ttm_bo_kmap? */ + vaddr = obj->vmap.vaddr; #endif if (IS_ERR(vaddr)) { drm_err(&dev_priv->drm, -- 2.34.1