diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-17 22:05:08 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-17 22:05:11 -0400 |
| commit | c13bbf4a78aafed144de0250a3c71265672c9bda (patch) | |
| tree | 54edb601a81ce803d42e1fe55c93b6a7f7f42741 /drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | |
| parent | 28b32b9f61fe73e7625ed30c35afd6d8a0ed2b6e (diff) | |
| parent | 8e16695b4eb819881774b8c06eb164dc1fb74275 (diff) | |
Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.20. Highlights:
- VCN DPG fixes for Picasso
- Add support for the latest vega20 vbios
- Scheduler timeout fix
- License fixes for radeon and amdgpu
- Misc other fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181017215427.2804-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c index b160b958e5fe..f212402570a5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: MIT |
| 2 | /* Copyright Red Hat Inc 2010. | 2 | /* Copyright Red Hat Inc 2010. |
| 3 | * | 3 | * |
| 4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |