Commit e65e175b authored by Oded Gabbay's avatar Oded Gabbay

habanalabs: move driver to accel subsystem

Now that we have a subsystem for compute accelerators, move the
habanalabs driver to it.

This patch only moves the files and fixes the Makefiles. Future
patches will change the existing code to register to the accel
subsystem and expose the accel device char files instead of the
habanalabs device char files.

Update the MAINTAINERS file to reflect this change.
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 7d25cae7
...@@ -9032,11 +9032,13 @@ F: block/partitions/efi.* ...@@ -9032,11 +9032,13 @@ F: block/partitions/efi.*
HABANALABS PCI DRIVER HABANALABS PCI DRIVER
M: Oded Gabbay <ogabbay@kernel.org> M: Oded Gabbay <ogabbay@kernel.org>
L: dri-devel@lists.freedesktop.org
S: Supported S: Supported
C: irc://irc.oftc.net/dri-devel
T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git
F: Documentation/ABI/testing/debugfs-driver-habanalabs F: Documentation/ABI/testing/debugfs-driver-habanalabs
F: Documentation/ABI/testing/sysfs-driver-habanalabs F: Documentation/ABI/testing/sysfs-driver-habanalabs
F: drivers/misc/habanalabs/ F: drivers/accel/habanalabs/
F: include/trace/events/habanalabs.h F: include/trace/events/habanalabs.h
F: include/uapi/drm/habanalabs_accel.h F: include/uapi/drm/habanalabs_accel.h
......
...@@ -189,4 +189,4 @@ obj-$(CONFIG_COUNTER) += counter/ ...@@ -189,4 +189,4 @@ obj-$(CONFIG_COUNTER) += counter/
obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_MOST) += most/
obj-$(CONFIG_PECI) += peci/ obj-$(CONFIG_PECI) += peci/
obj-$(CONFIG_HTE) += hte/ obj-$(CONFIG_HTE) += hte/
obj-$(CONFIG_DRM_ACCEL) += accel/ obj-$(CONFIG_DRM_ACCEL) += accel/
\ No newline at end of file
...@@ -23,4 +23,5 @@ menuconfig DRM_ACCEL ...@@ -23,4 +23,5 @@ menuconfig DRM_ACCEL
different device files, called accel/accel* (in /dev, sysfs different device files, called accel/accel* (in /dev, sysfs
and debugfs). and debugfs).
source "drivers/accel/habanalabs/Kconfig"
source "drivers/accel/ivpu/Kconfig" source "drivers/accel/ivpu/Kconfig"
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-y += habanalabs/
obj-y += ivpu/ obj-y += ivpu/
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
# HabanaLabs AI accelerators driver # HabanaLabs AI accelerators driver
# #
config HABANA_AI config DRM_ACCEL_HABANALABS
tristate "HabanaAI accelerators (habanalabs)" tristate "HabanaLabs AI accelerators"
depends on DRM_ACCEL
depends on X86_64
depends on PCI && HAS_IOMEM depends on PCI && HAS_IOMEM
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR
select HWMON select HWMON
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Makefile for HabanaLabs AI accelerators driver # Makefile for HabanaLabs AI accelerators driver
# #
obj-$(CONFIG_HABANA_AI) := habanalabs.o obj-$(CONFIG_DRM_ACCEL_HABANALABS) := habanalabs.o
include $(src)/common/Makefile include $(src)/common/Makefile
habanalabs-y += $(HL_COMMON_FILES) habanalabs-y += $(HL_COMMON_FILES)
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment