diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-26 14:10:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-26 14:10:26 +1000 |
| commit | 4d5308e7852741318e4d40fb8d43d9311b3984ae (patch) | |
| tree | d17630efbf01522c54f7758f314b2e5bc98f8a5e /drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | |
| parent | f480de3f4a2b1ec184f7b5178943adf31080fc2c (diff) | |
| parent | 92e6475ae0a0383b012eb21c1aaf0e5456b1a3d9 (diff) | |
| download | linux-4d5308e7852741318e4d40fb8d43d9311b3984ae.tar.gz linux-4d5308e7852741318e4d40fb8d43d9311b3984ae.tar.bz2 linux-4d5308e7852741318e4d40fb8d43d9311b3984ae.zip | |
Merge tag 'drm-fixes-5.3-2019-07-24' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
drm-fixes-5.3-2019-07-24:
amdgpu:
- RAS fixes for vega20
- Navi VCN fix
- DC audio fixes
- DC DSC fixes
- DC dongle fixes
- DC clk mgr fixes
- Fix DDC lines on some RV2 boards
- GDS fixes for compute
- Navi SMU fixes
ttm:
- Use the same attributes when freeing d_page->vaddr
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190724210527.3415-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h index 959f5b654611..9502478c4a1b 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h @@ -61,8 +61,8 @@ enum dcn_hubbub_page_table_depth { }; enum dcn_hubbub_page_table_block_size { - DCN_PAGE_TABLE_BLOCK_SIZE_4KB, - DCN_PAGE_TABLE_BLOCK_SIZE_64KB + DCN_PAGE_TABLE_BLOCK_SIZE_4KB = 0, + DCN_PAGE_TABLE_BLOCK_SIZE_64KB = 4, }; struct dcn_hubbub_phys_addr_config { |