diff options
author | Dave Airlie <airlied@redhat.com> | 2020-05-22 13:17:05 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-05-22 13:17:12 +1000 |
commit | 918b73dcfc69f976d6210028dcb50fbcd15c15ae (patch) | |
tree | 001d7e542a6a3cbeb98ad5ed92202f1a46f99daf /drivers/gpu/drm/nouveau/Kbuild | |
parent | 5f0ed4f8f684a2e824c582aee0420a24d43642cd (diff) | |
parent | dc455f4c888365595c0a13da445e092422d55b8d (diff) |
Merge branch 'linux-5.8' of git://github.com/skeggsb/linux into drm-next
- HD audio fixes on recent systems
- vGPU detection (fail probe if we're on one, for now)
- Interlaced mode fixes (mostly avoidance on Turing, which doesn't support it)
- SVM improvements/fixes
- NVIDIA format modifier support
- Misc other fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv6DcRFMDVEftdL7LxNtxuSQQ=qnfqdHXO0K=BmJ8Q2-+g@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/Kbuild')
-rw-r--r-- | drivers/gpu/drm/nouveau/Kbuild | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index 7a62fa04272d..49e57fba4925 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -1,8 +1,10 @@ +NOUVEAU_PATH ?= $(srctree) + # SPDX-License-Identifier: MIT -ccflags-y += -I $(srctree)/$(src)/include -ccflags-y += -I $(srctree)/$(src)/include/nvkm -ccflags-y += -I $(srctree)/$(src)/nvkm -ccflags-y += -I $(srctree)/$(src) +ccflags-y += -I $(NOUVEAU_PATH)/$(src)/include +ccflags-y += -I $(NOUVEAU_PATH)/$(src)/include/nvkm +ccflags-y += -I $(NOUVEAU_PATH)/$(src)/nvkm +ccflags-y += -I $(NOUVEAU_PATH)/$(src) # NVKM - HW resource manager #- code also used by various userspace tools/tests |