drm/amd/display: Populate hostvm parameter before DML calculation

[Why]
If the system does not have hostvm enabled, disabling it for
DML validation will allow more modes to pass at lower voltage
levels.

[How]
When initializing HostVM save state to hubbub and read back
when populating DML pipes from context.

Signed-off-by: Sung Lee <sung.lee@amd.com>
Acked-by: Bindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
index 129f0b62f7512bd4fb51377a198e5d0fe35e4340..42fbb5e6d5057ea1f47ea5c653b404063e03fd93 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
@@ -99,6 +99,8 @@ void dcn21_dchvm_init(struct hubbub *hubbub)
 
                //Poll until HOSTVM_PREFETCH_DONE = 1
                REG_WAIT(DCHVM_RIOMMU_STAT0, HOSTVM_PREFETCH_DONE, 1, 5, 100);
+
+               hubbub->riommu_active = true;
        }
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
index ed3f6253530195effeffddbb3169b2b5ec5c1dd9..1c88d2edd381c567e9b0759010051b62a19b39e4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
@@ -1886,7 +1886,7 @@ static int dcn21_populate_dml_pipes_from_context(
 
        for (i = 0; i < pipe_cnt; i++) {
 
-               pipes[i].pipe.src.hostvm = 1;
+               pipes[i].pipe.src.hostvm = dc->res_pool->hubbub->riommu_active;
                pipes[i].pipe.src.gpuvm = 1;
        }
 

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 5425e92efcb8163db098dfb99fd07c29d8bdf4ac..d9fd28b34f2a1e269291c4f6cfbce52db6540a9d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
@@ -157,6 +157,7 @@ struct hubbub_funcs {
 struct hubbub {
        const struct hubbub_funcs *funcs;
        struct dc_context *ctx;
+       bool riommu_active;
 };
 
 #endif