diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-05-09 11:03:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-05-09 11:04:00 +1000 |
| commit | eb85d03e01c3e9f3b0ba7282b2e3515a635decb2 (patch) | |
| tree | acffc7d52bae052a8181a81725f9c44c5e432ac9 /drivers/gpu/drm/amd | |
| parent | Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (diff) | |
| parent | drm/msm/a6xx: No zap shader is not an error (diff) | |
| download | linux-dev-eb85d03e01c3e9f3b0ba7282b2e3515a635decb2.tar.xz linux-dev-eb85d03e01c3e9f3b0ba7282b2e3515a635decb2.zip | |
Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- A handful of fixes from -next that just missed feature freeze
- More panfrost fixes that went directly in -misc-next-fixes (various)
- Fix searchpaths during build (Masahiro)
- msm patch to fix the driver for chips without zap shader (Rob)
- Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf)
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Rob Clark <robdclark@chromium.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190508205153.GA91135@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index f8c58c425eb9..fdd0ca4b0f0b 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -23,7 +23,7 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -FULL_AMD_PATH=$(src)/.. +FULL_AMD_PATH=$(srctree)/$(src)/.. DISPLAY_FOLDER_NAME=display FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) |