diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 13:49:15 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 13:49:15 -0300 |
| commit | facbf0b9820f34f14b54f567862b4a96e910f468 (patch) | |
| tree | ee65e875e4167dd903f2745cfbf6b2735fd1cd9e /drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | |
| parent | perf symbols: Add s390 idle functions 'psw_idle' and 'psw_idle_exit' to list of idle symbols (diff) | |
| parent | Merge tag 'perf-tools-fixes-2020-07-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux (diff) | |
| download | linux-dev-facbf0b9820f34f14b54f567862b4a96e910f468.tar.xz linux-dev-facbf0b9820f34f14b54f567862b4a96e910f468.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c index 58f9d8c3a17a..44f927641b89 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c @@ -204,6 +204,7 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, (mode_info->atom_context->bios + data_offset); switch (crev) { case 11: + case 12: mem_channel_number = igp_info->v11.umachannelnumber; /* channel width is 64 */ if (vram_width) |