diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-08-23 11:24:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-08-23 11:24:54 +1000 |
| commit | 8f13b60756a1e5ddc9aa8c6b14807264b6833e5b (patch) | |
| tree | 151d90b523a7cb7483c828d270c67fbe60e19333 /drivers/gpu/drm/amd/display/dc/Makefile | |
| parent | 4d1608eebcb2191b10ac3aa4ca743a38ac05e100 (diff) | |
| parent | 9d1d02ff36783f954a206dfbf7943b7f2057f58b (diff) | |
Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.19:
- Fix build when KCOV is enabled
- Misc display fixes
- A couple of SR-IOV fixes
- Fence fixes for eviction handling for KFD
- Misc other fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180822203813.2733-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/Makefile')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/Makefile b/drivers/gpu/drm/amd/display/dc/Makefile index 532a515fda9a..aed538a4d1ba 100644 --- a/drivers/gpu/drm/amd/display/dc/Makefile +++ b/drivers/gpu/drm/amd/display/dc/Makefile @@ -25,7 +25,7 @@ DC_LIBS = basics bios calcs dce gpio i2caux irq virtual -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 DC_LIBS += dcn10 dml endif |