From patchwork Thu Dec 21 22:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502733 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 1601BC46CCD for ; Thu, 21 Dec 2023 22:28:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3872710E729; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5373710E718; Thu, 21 Dec 2023 22:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197694; x=1734733694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2kcPciUEqH8SQV45LDXl4Zh0ttsAlaPTH30v07QTwH4=; b=lCW7lb15BRxsE3MoSnqLSPwK7fUJ5OKg0GT87AtHLZbEhMoGpQmYWH+8 B8Dr2p9tnLSTcNAnoJbYdyGNcMVIwrVkdjaCR2V+hJfk0OEovPFV4GMRQ 52RwoLW+zZ8p4A2y7FckOmoeknG0QMUijVnDQ9+JvrIyjJvP3pHlQ/Was lDCEjm2HvB0vLiELbrwK+v08t+V9kBYDmI1zOm8C0dD/jbdmdR+NkcsQH dj9rkiS84HdPU3jKiYswNUm373zAK6w9rLyeHvCrsNyeFDN+JuHokLs1Y ejzgmhd8myAc3X1Tj7ME5U730znx7r05bMDhasYsEfCXy39jkIldRAY8K w==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876514" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876514" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458210" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458210" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:13 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 1/6] drm/xe: Disable 32bits build Date: Thu, 21 Dec 2023 14:28:04 -0800 Message-Id: <20231221222809.4123220-2-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, Rodrigo Vivi , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add a dependency on CONFIG_64BIT since currently the xe driver doesn't build on 32bits. It may be enabled again after all the issues are fixed. Signed-off-by: Lucas De Marchi Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/xe/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 5b3da06e7ba3..a53b0fdc15a7 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_XE tristate "Intel Xe Graphics" - depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) + depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) && 64BIT select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular # the shmem_readpage() which depends upon tmpfs From patchwork Thu Dec 21 22:28:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502730 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 2A5B3C46CD8 for ; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D48A10E71C; Thu, 21 Dec 2023 22:28:15 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 804E810E716; Thu, 21 Dec 2023 22:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197694; x=1734733694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XmD6xMGWVeq1qWnVvU1CNrzCFsAIQn1lcBHypKh9pHI=; b=Io5IcS7barAWzd3bLWiSBLldVxYzY4mAWtXUTgeUcBbnz0CkKH4zD/er uW4nDaXylrr18zC3eR19TyyiRMgb5wBX/vxO2lyFq/d45S4YuwYp8kSwq lqnkxmWDRdl/QjF6jfIw9XnmsKBZBwPd+qLroL8wejD66Jla/rGY0eibt UCq8zdSy11++WhW6WuR9ARO+cgeNceuEk5EZs25UjHGkKFTrFa0yOygcy l9Emh8lYnuHEfXla7WS0o8RSLLo1pLXppwNPUatjO21dujxTATSDYh87Z s+DUPQj6SEcOKM2m6CTUU/DLXQRAWlxrpEEEsQeQCA3g9SEm8M95XFbLv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876519" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876519" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458213" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458213" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:13 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 2/6] drm/xe: Use _ULL for u64 division Date: Thu, 21 Dec 2023 14:28:05 -0800 Message-Id: <20231221222809.4123220-3-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, Rodrigo Vivi , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use DIV_ROUND_UP_ULL() so it also works on 32bit build. Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 86867d42d532..3f0dcf54277b 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -620,7 +620,7 @@ void xe_device_wmb(struct xe_device *xe) u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size) { return xe_device_has_flat_ccs(xe) ? - DIV_ROUND_UP(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0; + DIV_ROUND_UP_ULL(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0; } bool xe_device_mem_access_ongoing(struct xe_device *xe) From patchwork Thu Dec 21 22:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502731 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 14EECC46CCD for ; Thu, 21 Dec 2023 22:28:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E2F810E724; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A611E10E718; Thu, 21 Dec 2023 22:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197694; x=1734733694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2vlhA0Z+yUURdiyoYIjeL3Dtqhk6Yo4zPyy/4tJp7E4=; b=gqCTzPW/wqFay8vz4BrjTD5KVvLOh+gwbECapwSaDna8uCqBtiBBo0PC CETPJQKHDm6PwgEoFruLy8jaljtPIpQx6S7bkJnJDlQFddlF05KJP/gKb O0j0J82Z+5YgvEl950MxbbSCG2Hx8TFqXcsdZk4/YafJYExkJPnTYxWoi +6QaQmYzaITDOEFtmX6lfl8fFVTtxbShXxrvrlstcA6F632pg6yv43kjX YBXj3vOjqsRUdnJUMJaAj/A2/3mgQm+qWhAwqj+kUQPGFdGSemO3ORXIc ChFGoA6xJk441DCreFa045/4xYsz4tHDH6jZALMn52waSR8G30Krxm1F+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876523" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876523" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458216" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458216" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 3/6] drm/xe/mmio: Cast to u64 when printing Date: Thu, 21 Dec 2023 14:28:06 -0800 Message-Id: <20231221222809.4123220-4-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Brost , thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, "Michael J . Ruhl" , Oak Zeng , Rodrigo Vivi , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" resource_size_t uses %pa format in printk since the size varies depending on build options. However to keep the io_size/physical_size addition in the same call we can't pass the address without adding yet another variable in these function. Simply cast it to u64 and keep using %llx. Fixes: 286089ce6929 ("drm/xe: Improve vram info debug printing") Cc: Oak Zeng Cc: Michael J. Ruhl Cc: Matthew Brost Cc: Rodrigo Vivi Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index f660cfb79f50..5c46f2d0b6dc 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -272,8 +272,8 @@ int xe_mmio_probe_vram(struct xe_device *xe) drm_info(&xe->drm, "VRAM[%u, %u]: Actual physical size %pa, usable size exclude stolen %pa, CPU accessible size %pa\n", id, tile->id, &tile->mem.vram.actual_physical_size, &tile->mem.vram.usable_size, &tile->mem.vram.io_size); drm_info(&xe->drm, "VRAM[%u, %u]: DPA range: [%pa-%llx], io range: [%pa-%llx]\n", id, tile->id, - &tile->mem.vram.dpa_base, tile->mem.vram.dpa_base + tile->mem.vram.actual_physical_size, - &tile->mem.vram.io_start, tile->mem.vram.io_start + tile->mem.vram.io_size); + &tile->mem.vram.dpa_base, tile->mem.vram.dpa_base + (u64)tile->mem.vram.actual_physical_size, + &tile->mem.vram.io_start, tile->mem.vram.io_start + (u64)tile->mem.vram.io_size); /* calculate total size using tile size to get the correct HW sizing */ total_size += tile_size; From patchwork Thu Dec 21 22:28:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502734 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 BB143C46CD8 for ; Thu, 21 Dec 2023 22:28:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 956B910E72D; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB56110E71C; Thu, 21 Dec 2023 22:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197695; x=1734733695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G6FwInhmVgslPiDEh7NzRcFZRdFlcS3bGJvtIQWy4Cc=; b=aLNb5q4Wyv4JM8yf3QB8wNOjTsl2AQOEUTG0QAKuqyqBJzTbgqKwb74/ +lLsAbxMaSEsd1L9DzOhNxOkgKOVfaal//zKyCX96i5NLGfVVFPqXXE3d wo6Q9ESsH7ky7zMAgtwQ9Z+FdghjWz5LOt+RU+GR6WE32ySm0+nyUG+o5 ZbUP8IToDZucQScy0HCRwpmOYDijAp+0JpiMQSLaaRV/NiXKpJyevf3T2 /xGu+4FtgH76zAuL+a/0Hp3TJTbgHXZqn0FHd9Wch0IMq774tyOghejFV bkphLzy2a6LPfdaBdbfCC8CddaAjLOu3UDeU48a6IsqgAdYyEUBsYDWXO w==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876527" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876527" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458219" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458219" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 4/6] drm/xe/display: Avoid calling readq() Date: Thu, 21 Dec 2023 14:28:07 -0800 Message-Id: <20231221222809.4123220-5-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, Rodrigo Vivi , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" readq() is not available in 32bits. iosys-map already has the logic in place to use read u64 in all cases, so simply add a helper variable for using that. Fixes: 44e694958b95 ("drm/xe/display: Implement display support") Signed-off-by: Lucas De Marchi --- .../gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h index 5f19550cc845..6739dadaf1a9 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h @@ -7,6 +7,7 @@ #define _I915_GEM_OBJECT_H_ #include +#include #include "xe_bo.h" @@ -36,6 +37,7 @@ static inline int i915_gem_object_read_from_page(struct xe_bo *bo, { struct ttm_bo_kmap_obj map; void *virtual; + struct iosys_map vaddr; bool is_iomem; int ret; @@ -52,10 +54,11 @@ static inline int i915_gem_object_read_from_page(struct xe_bo *bo, ofs &= ~PAGE_MASK; virtual = ttm_kmap_obj_virtual(&map, &is_iomem); if (is_iomem) - *ptr = readq((void __iomem *)(virtual + ofs)); + iosys_map_set_vaddr_iomem(&vaddr, (void __iomem *)(virtual)); else - *ptr = *(u64 *)(virtual + ofs); + iosys_map_set_vaddr(&vaddr, virtual); + *ptr = iosys_map_rd(&vaddr, ofs, u64); ttm_bo_kunmap(&map); out_unlock: xe_bo_unlock(bo); From patchwork Thu Dec 21 22:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502736 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 9E378C46CD3 for ; Thu, 21 Dec 2023 22:28:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D994610E72C; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 128BF10E718; Thu, 21 Dec 2023 22:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197695; x=1734733695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8K/h1/j4SNbUYxEYWeTpA8KkHoZAgBmuZ8QW30qjzF4=; b=KvPByV5lTreEXNsOWmk5W0S1icsdWPg2nNa1hd+YCr3taNcPd7kZLYm/ ONz0BfAKwEH3klmxL0V2yVMAQpZUZmXAlkLKNejCNm8I9aQcFhWcwv6Ac s9IH51HNFFiL2N6odIFIhV8upI56OeHtEqP6eNMiQt7ukb1T05Gdd/UM6 iPF+g1jysXuWqXXo3sFO0gCFEvaS6uAjKtKNoLOD7HD9PUTq6FXHPbNtM xOTElAdxFP5fr/Ty//5qJLvzdq1mieBY7pnB83RR3XmkLybkOkUKYRgpq nYaa0U8zgQWdHc1vIPT5Lz8eAjGK7SzZZ+LVXtnlvX27rOuf6Ct34jFqE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876531" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876531" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458222" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458222" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 5/6] drm/xe: Fix cast on trace variable Date: Thu, 21 Dec 2023 14:28:08 -0800 Message-Id: <20231221222809.4123220-6-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Brost , thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, Rodrigo Vivi , Niranjana Vishwanathapura , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Cast the pointer to unsigned long and let it be implicitly extended to u64. This fixes the build on 32bits arch. Cc: Matthew Brost Cc: Niranjana Vishwanathapura Cc: Rodrigo Vivi Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_trace.h b/drivers/gpu/drm/xe/xe_trace.h index 95163c303f3e..e4e7262191ad 100644 --- a/drivers/gpu/drm/xe/xe_trace.h +++ b/drivers/gpu/drm/xe/xe_trace.h @@ -31,7 +31,7 @@ DECLARE_EVENT_CLASS(xe_gt_tlb_invalidation_fence, ), TP_fast_assign( - __entry->fence = (u64)fence; + __entry->fence = (unsigned long)fence; __entry->seqno = fence->seqno; ), From patchwork Thu Dec 21 22:28:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13502735 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 40A98C46CCD for ; Thu, 21 Dec 2023 22:28:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0CF610E72E; Thu, 21 Dec 2023 22:28:16 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46D0410E722; Thu, 21 Dec 2023 22:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703197695; x=1734733695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3sFxOzignG7QJ8LUvSkwRZ0eN/kd+CsuzD/vIyAotPY=; b=lYOXOEuqH48D3jbxOdCVBP0iC3bvCrLm0mmfjEuun/AafRJg/23C59R/ EDyHWWMpnhDOzkgOzYmZRJRW0KzojhO09XRbz9TZl8vo0BIMtIcByB2G1 K9sq9zDQTIZtzZJX1GrJD56mK2Nni34aXljgGBUXp8fqi42+QCQZpnRPJ lA9Hk3gkaHfKTT6FSwnU04DAMXHQ5lfHSc0uyj8H0eCxUcZTJ3FJgdD4j CE7U61+FGn8f0fd1zFEBURWpS1nYlJMPs4KUFPP1OhVk6PA1AtSvtuLer 2G66m3bSqsWA9wYBWRWCY9RETcGBeu9L5/HuhP4w7b3Cot0uqShMx5lRk A==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="2876535" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="2876535" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="920458225" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="920458225" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 14:28:14 -0800 From: Lucas De Marchi To: intel-xe@lists.freedesktop.org Subject: [PATCH 6/6] drm/xe: Enable 32bits build Date: Thu, 21 Dec 2023 14:28:09 -0800 Message-Id: <20231221222809.4123220-7-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221222809.4123220-1-lucas.demarchi@intel.com> References: <20231221222809.4123220-1-lucas.demarchi@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.hellstrom@linux.intel.com, daniel.vetter@ffwll.ch, ogabbay@kernel.org, Lucas De Marchi , dri-devel@lists.freedesktop.org, Rodrigo Vivi , airlied@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now that all the issues with 32bits are fixed, enable it again. Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index a53b0fdc15a7..5b3da06e7ba3 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_XE tristate "Intel Xe Graphics" - depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) && 64BIT + depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular # the shmem_readpage() which depends upon tmpfs