diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-06-14 21:32:23 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-06-14 21:32:29 -0400 |
| commit | daf0678c2036c918f01e4aa6035629d2debc2f30 (patch) | |
| tree | 8a6ddd16c351bdf69487e5ca396333447796da8c /drivers/gpu/drm/amd/amdgpu/df_v3_6.c | |
| parent | 33ce21d6a2491ef9adb8dc395e3f5bbbfcdc95b5 (diff) | |
| parent | 5c16f36f6f003b4415237acca59384a074cd8030 (diff) | |
Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.18. Highlights:
- Fixes for gfxoff on Raven
- Remove an ATPX quirk now that the root cause is fixed
- Runtime PM fixes
- Vega20 register header update
- Wattman fixes
- Misc bug fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614141428.2909-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/df_v3_6.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c index 60608b3df881..d5ebe566809b 100644 --- a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c +++ b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c | |||
| @@ -64,7 +64,7 @@ static u32 df_v3_6_get_hbm_channel_number(struct amdgpu_device *adev) | |||
| 64 | int fb_channel_number; | 64 | int fb_channel_number; |
| 65 | 65 | ||
| 66 | fb_channel_number = adev->df_funcs->get_fb_channel_number(adev); | 66 | fb_channel_number = adev->df_funcs->get_fb_channel_number(adev); |
| 67 | if (fb_channel_number > ARRAY_SIZE(df_v3_6_channel_number)) | 67 | if (fb_channel_number >= ARRAY_SIZE(df_v3_6_channel_number)) |
| 68 | fb_channel_number = 0; | 68 | fb_channel_number = 0; |
| 69 | 69 | ||
| 70 | return df_v3_6_channel_number[fb_channel_number]; | 70 | return df_v3_6_channel_number[fb_channel_number]; |