Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 15:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe/mmio: Use non-atomic writeq/readq variant for 32b

Browse Source 
writeq() and readq() and other functions working on 64 bit variables
are not provided by 32b arch. For that it's needed to choose between
linux/io-64-nonatomic-hi-lo.h and linux/io-64-nonatomic-lo-hi.h,
spliting the read/write in 2 accesses. For xe driver, it doesn't matter
much, so just choose one and include in xe_mmio.h.

This also removes some ifdef CONFIG_64BIT we had around because of the
missing 64bit functions.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Lucas De Marchi 2022-12-22 12:15:24 -08:00 committed by Rodrigo Vivi
parent 857912c37e
commit 9a6e6c14bf
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/xe/xe_mmio.c
View File

@ -48,7 +48,6 @@ mask_err:
return err;
}
#ifdef CONFIG_64BIT
static int
_resize_bar(struct xe_device *xe, int resno, resource_size_t size)
{
@ -132,9 +131,6 @@ static int xe_resize_lmem_bar(struct xe_device *xe, resource_size_t lmem_size)
pci_write_config_dword(pdev, PCI_COMMAND, pci_cmd);
return ret;
}
#else
static int xe_resize_lmem_bar(struct xe_device *xe, resource_size_t lmem_size) { return 0; }
#endif
static bool xe_pci_resource_valid(struct pci_dev *pdev, int bar)
{
@ -236,10 +232,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)
drm_warn(&xe->drm, "Restricting VRAM size to PCI resource size (0x%llx->0x%llx)\n",
lmem_size, (u64)xe->mem.vram.size);
#ifdef CONFIG_64BIT
xe->mem.vram.mapping = ioremap_wc(xe->mem.vram.io_start, xe->mem.vram.size);
#endif
xe->mem.vram.size = min_t(u64, xe->mem.vram.size, usable_size);
drm_info(&xe->drm, "TOTAL VRAM: %pa, %pa\n", &xe->mem.vram.io_start, &xe->mem.vram.size);

1
drivers/gpu/drm/xe/xe_mmio.h
View File

@ -7,6 +7,7 @@
#define _XE_MMIO_H_
#include <linux/delay.h>
#include <linux/io-64-nonatomic-lo-hi.h>
#include "xe_gt_types.h"