diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-07 06:27:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-07 06:27:13 +1000 |
| commit | db8f884ca7fe6af64d443d1510464efe23826131 (patch) | |
| tree | 261dfc805059272231e5f827882c2d10c19eb239 /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |
| parent | ae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff) | |
| parent | e60bb46b5754727c7643cc5bb7b005c49f869930 (diff) | |
| download | linux-db8f884ca7fe6af64d443d1510464efe23826131.tar.gz linux-db8f884ca7fe6af64d443d1510464efe23826131.tar.xz | |
Merge branch 'drm-fixes-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
ttm and license fixes
* 'drm-fixes-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/ttm: swap consecutive allocated pooled pages v4
drm/ttm: swap consecutive allocated cached pages v3
drm/ttm: roundup the shrink request to prevent skip huge pool
drm/ttm: add page order support in ttm_pages_put
drm/ttm: add set_pages_wb for handling page order more than zero
drm/ttm: add page order in page pool
drm/ttm: use NUM_PAGES_TO_ALLOC always
drm/amdgpu: add license to files where it was missing
drm/amdgpu: add license to Makefiles
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 6c570d4e4516..f8edf5483f11 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -1,4 +1,6 @@ /* + * Copyright 2017 Advanced Micro Devices, Inc. + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation |