diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-04 10:22:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-04 10:22:53 +1000 |
| commit | 8a86b00a437ec06b298477463c7a9b8774570507 (patch) | |
| tree | 82a09728da08ee4655721159f92054950dbb53e3 /drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | |
| parent | 2ef4144d1ea8b181d377d0783c43032cb44889f7 (diff) | |
| parent | 5ab5e4e60accd13b0a505a4a34b6feafde2c8fbf (diff) | |
| download | linux-8a86b00a437ec06b298477463c7a9b8774570507.tar.gz linux-8a86b00a437ec06b298477463c7a9b8774570507.tar.bz2 linux-8a86b00a437ec06b298477463c7a9b8774570507.zip | |
Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-01:
amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arcturus
- Misc PSP fixes
- Misc DC fixes
- swSMU cleanup
amdkfd:
- Misc cleanups
- Fix typo in cu bitmap parsing
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101190607.3763-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index d2e7b4fe5659..ae6f5446262c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -19,9 +19,6 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ - -#define pr_fmt(fmt) "kfd2kgd: " fmt - #include <linux/dma-buf.h> #include <linux/list.h> #include <linux/pagemap.h> |