drm/amd/display: Pass log_mask from DM

Linux and Windows often desire different log levels.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index bb4f415..5f4e7dc 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -374,6 +374,8 @@ int amdgpu_dm_init(struct amdgpu_device *adev)
 
        init_data.dce_environment = DCE_ENV_PRODUCTION_DRV;
 
+       init_data.log_mask = DC_DEFAULT_LOG_MASK;
+
 #ifdef ENABLE_FBC
        if (adev->family == FAMILY_CZ)
                amdgpu_dm_initialize_fbc(adev);

diff --git a/drivers/gpu/drm/amd/display/dc/basics/logger.c b/drivers/gpu/drm/amd/display/dc/basics/logger.c
index 0b17374..5895dd3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/basics/logger.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/logger.c
@@ -64,40 +64,9 @@ static const struct dc_log_type_info log_type_info_tbl[] = {
 };
 
 
-#define DC_DEFAULT_LOG_MASK ((1 << LOG_ERROR) | \
-               (1 << LOG_WARNING) | \
-               (1 << LOG_EVENT_MODE_SET) | \
-               (1 << LOG_EVENT_DETECTION) | \
-               (1 << LOG_EVENT_LINK_TRAINING) | \
-               (1 << LOG_EVENT_LINK_LOSS) | \
-               (1 << LOG_EVENT_UNDERFLOW) | \
-               (1 << LOG_RESOURCE) | \
-               (1 << LOG_FEATURE_OVERRIDE) | \
-               (1 << LOG_DETECTION_EDID_PARSER) | \
-               (1 << LOG_DC) | \
-               (1 << LOG_HW_HOTPLUG) | \
-               (1 << LOG_HW_SET_MODE) | \
-               (1 << LOG_HW_RESUME_S3) | \
-               (1 << LOG_HW_HPD_IRQ) | \
-               (1 << LOG_SYNC) | \
-               (1 << LOG_BANDWIDTH_VALIDATION) | \
-               (1 << LOG_MST) | \
-               (1 << LOG_DETECTION_DP_CAPS) | \
-               (1 << LOG_BACKLIGHT)) | \
-               (1 << LOG_I2C_AUX) | \
-               (1 << LOG_IF_TRACE) | \
-               (1 << LOG_DTN) /* | \
-               (1 << LOG_DEBUG) | \
-               (1 << LOG_BIOS) | \
-               (1 << LOG_SURFACE) | \
-               (1 << LOG_SCALER) | \
-               (1 << LOG_DML) | \
-               (1 << LOG_HW_LINK_TRAINING) | \
-               (1 << LOG_HW_AUDIO)| \
-               (1 << LOG_BANDWIDTH_CALCS)*/
-
 /* ----------- Object init and destruction ----------- */
-static bool construct(struct dc_context *ctx, struct dal_logger *logger)
+static bool construct(struct dc_context *ctx, struct dal_logger *logger,
+                     uint32_t log_mask)
 {
        /* malloc buffer and init offsets */
        logger->log_buffer_size = DAL_LOGGER_BUFFER_MAX_SIZE;
@@ -120,7 +89,7 @@ static bool construct(struct dc_context *ctx, struct dal_logger *logger)
 
        logger->ctx = ctx;
 
-       logger->mask = DC_DEFAULT_LOG_MASK;
+       logger->mask = log_mask;
 
        return true;
 }
@@ -133,14 +102,14 @@ static void destruct(struct dal_logger *logger)
        }
 }
 
-struct dal_logger *dal_logger_create(struct dc_context *ctx)
+struct dal_logger *dal_logger_create(struct dc_context *ctx, uint32_t log_mask)
 {
        /* malloc struct */
        struct dal_logger *logger = dm_alloc(sizeof(struct dal_logger));
 
        if (!logger)
                return NULL;
-       if (!construct(ctx, logger)) {
+       if (!construct(ctx, logger, log_mask)) {
                dm_free(logger);
                return NULL;
        }

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 5579d21..75a5fa2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -493,7 +493,7 @@ static bool construct(struct dc *dc,
        dc_ctx->asic_id = init_params->asic_id;
 
        /* Create logger */
-       logger = dal_logger_create(dc_ctx);
+       logger = dal_logger_create(dc_ctx, init_params->log_mask);
 
        if (!logger) {
                /* can *not* call logger. call base driver 'print error' */

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 1f0521f..9c0e000 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -267,6 +267,7 @@ struct dc_init_data {
        enum dce_environment dce_environment;
 
        struct dc_config flags;
+       uint32_t log_mask;
 #ifdef ENABLE_FBC
        uint64_t fbc_gpu_addr;
 #endif

diff --git a/drivers/gpu/drm/amd/display/include/logger_interface.h b/drivers/gpu/drm/amd/display/include/logger_interface.h
index 6641e80..5aaf2da 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/logger_interface.h
+++ b/drivers/gpu/drm/amd/display/include/logger_interface.h
@@ -40,7 +40,7 @@ struct dc_state;
  *
  */
 
-struct dal_logger *dal_logger_create(struct dc_context *ctx);
+struct dal_logger *dal_logger_create(struct dc_context *ctx, uint32_t log_mask);
 
 uint32_t dal_logger_destroy(struct dal_logger **logger);
 

diff --git a/drivers/gpu/drm/amd/display/include/logger_types.h b/drivers/gpu/drm/amd/display/include/logger_types.h
index 42ffb93..044805c 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/logger_types.h
+++ b/drivers/gpu/drm/amd/display/include/logger_types.h
@@ -70,6 +70,38 @@ enum dc_log_type {
        LOG_SECTION_TOTAL_COUNT
 };
 
+#define DC_DEFAULT_LOG_MASK ((1 << LOG_ERROR) | \
+               (1 << LOG_WARNING) | \
+               (1 << LOG_EVENT_MODE_SET) | \
+               (1 << LOG_EVENT_DETECTION) | \
+               (1 << LOG_EVENT_LINK_TRAINING) | \
+               (1 << LOG_EVENT_LINK_LOSS) | \
+               (1 << LOG_EVENT_UNDERFLOW) | \
+               (1 << LOG_RESOURCE) | \
+               (1 << LOG_FEATURE_OVERRIDE) | \
+               (1 << LOG_DETECTION_EDID_PARSER) | \
+               (1 << LOG_DC) | \
+               (1 << LOG_HW_HOTPLUG) | \
+               (1 << LOG_HW_SET_MODE) | \
+               (1 << LOG_HW_RESUME_S3) | \
+               (1 << LOG_HW_HPD_IRQ) | \
+               (1 << LOG_SYNC) | \
+               (1 << LOG_BANDWIDTH_VALIDATION) | \
+               (1 << LOG_MST) | \
+               (1 << LOG_DETECTION_DP_CAPS) | \
+               (1 << LOG_BACKLIGHT)) | \
+               (1 << LOG_I2C_AUX) | \
+               (1 << LOG_IF_TRACE) | \
+               (1 << LOG_DTN) /* | \
+               (1 << LOG_DEBUG) | \
+               (1 << LOG_BIOS) | \
+               (1 << LOG_SURFACE) | \
+               (1 << LOG_SCALER) | \
+               (1 << LOG_DML) | \
+               (1 << LOG_HW_LINK_TRAINING) | \
+               (1 << LOG_HW_AUDIO)| \
+               (1 << LOG_BANDWIDTH_CALCS)*/
+
 union logger_flags {
        struct {
                uint32_t ENABLE_CONSOLE:1; /* Print to console */