From: Dave Airlie <airlied@redhat.com>
Date: Thu, 23 Sep 2021 22:39:02 +0000 (+1000)
Subject: Merge tag 'amd-drm-fixes-5.15-2021-09-23' of https://gitlab.freedesktop.org/agd5f... 
X-Git-Tag: v5.15-rc3~26^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22a94600e28b5d52cda03abd8cf34d281f6db1db;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'amd-drm-fixes-5.15-2021-09-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

amd-drm-fixes-5.15-2021-09-23:

amdgpu:
- Update MAINTAINERS entry for powerplay
- Fix empty macros
- SI DPM fix

amdkfd:
- SVM fixes
- DMA mapping fix

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210923211330.20725-1-alexander.deucher@amd.com
---

22a94600e28b5d52cda03abd8cf34d281f6db1db