diff options
author | Dave Airlie <airlied@redhat.com> | 2018-12-06 04:28:19 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-12-06 04:29:09 +0100 |
commit | 513126ae00ba897cac1ab07f61edf062093d4dcb (patch) | |
tree | a6c8bf7e52609a4d3d42954eb4492f01113eaafc /drivers/gpu/drm/amd/display/Makefile | |
parent | Merge tag 'drm-intel-next-2018-12-04' of git://anongit.freedesktop.org/drm/dr... (diff) | |
parent | drm/amdgpu: wait for IB test on first device open (diff) | |
download | linux-513126ae00ba897cac1ab07f61edf062093d4dcb.tar.xz linux-513126ae00ba897cac1ab07f61edf062093d4dcb.zip |
Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next
amdgpu and amdkfd:
- Freesync support
- ABM support in DC
- KFD support for vega12 and polaris12
- Add sdma paging queue support for vega
- Use ACPI to query backlight range on supported platforms
- Clean up doorbell handling
- KFD fix for pasid handling under non-HWS
- Misc cleanups and fixes
scheduler:
- Revert "fix timeout handling v2"
radeon:
- Fix possible overflow on 32 bit
ttm:
- Fix for LRU handling for ghost objects
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181130192505.2946-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/Makefile')
-rw-r--r-- | drivers/gpu/drm/amd/display/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/Makefile b/drivers/gpu/drm/amd/display/Makefile index c97dc9613325..cfde1568c79a 100644 --- a/drivers/gpu/drm/amd/display/Makefile +++ b/drivers/gpu/drm/amd/display/Makefile @@ -32,11 +32,12 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/inc subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/freesync subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/color subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/info_packet +subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/power #TODO: remove when Timing Sync feature is complete subdir-ccflags-y += -DBUILD_FEATURE_TIMING_SYNC=0 -DAL_LIBS = amdgpu_dm dc modules/freesync modules/color modules/info_packet +DAL_LIBS = amdgpu_dm dc modules/freesync modules/color modules/info_packet modules/power AMD_DAL = $(addsuffix /Makefile, $(addprefix $(FULL_AMD_DISPLAY_PATH)/,$(DAL_LIBS))) |