diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 08:37:39 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 08:37:39 +0300 |
commit | e6aa640eb2f68920cb849aec0cab44f05d843238 (patch) | |
tree | 42e07ee412112abe90d459f821e8d73c26cc648e /drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | |
parent | 1f573cce48a2ebb35953034062ef01056b7d6a58 (diff) | |
parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
download | linux-e6aa640eb2f68920cb849aec0cab44f05d843238.tar.xz |
Merge 5.3-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 { |