drm/amd/display: Driverside changes to support PSR in DMCUB
authorWyatt Wood <wyatt.wood@amd.com>
Thu, 12 Dec 2019 02:42:03 +0000 (21:42 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 16 Jan 2020 19:13:23 +0000 (14:13 -0500)
[Why]
Moving PSR from DMCU to DMCUB.

[How]
Add driverside PSR changes required to send inbox messages to fw.
These changes are non-functional until the psr structure allocation
is uncommented.

Signed-off-by: Wyatt Wood <wyatt.wood@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link.c
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
drivers/gpu/drm/amd/display/dc/inc/core_types.h
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h

index 5ea4a16..17f00cb 100644 (file)
@@ -45,6 +45,7 @@
 #include "dpcd_defs.h"
 #include "dmcu.h"
 #include "hw/clk_mgr.h"
+#include "../dce/dmub_psr.h"
 
 #define DC_LOGGER_INIT(logger)
 
@@ -2404,10 +2405,11 @@ bool dc_link_set_psr_allow_active(struct dc_link *link, bool allow_active, bool
 {
        struct dc  *dc = link->ctx->dc;
        struct dmcu *dmcu = dc->res_pool->dmcu;
+       struct dmub_psr *psr = dc->res_pool->psr;
 
-
-
-       if ((dmcu != NULL && dmcu->funcs->is_dmcu_initialized(dmcu)) && link->psr_feature_enabled)
+       if ((psr != NULL) && link->psr_feature_enabled)
+               psr->funcs->set_psr_enable(psr, allow_active);
+       else if ((dmcu != NULL && dmcu->funcs->is_dmcu_initialized(dmcu)) && link->psr_feature_enabled)
                dmcu->funcs->set_psr_enable(dmcu, allow_active, wait);
 
        link->psr_allow_active = allow_active;
@@ -2419,8 +2421,11 @@ bool dc_link_get_psr_state(const struct dc_link *link, uint32_t *psr_state)
 {
        struct dc  *dc = link->ctx->dc;
        struct dmcu *dmcu = dc->res_pool->dmcu;
+       struct dmub_psr *psr = dc->res_pool->psr;
 
-       if (dmcu != NULL && link->psr_feature_enabled)
+       if (psr != NULL && link->psr_feature_enabled)
+               psr->funcs->get_psr_state(psr_state);
+       else if (dmcu != NULL && link->psr_feature_enabled)
                dmcu->funcs->get_psr_state(dmcu, psr_state);
 
        return true;
@@ -2467,6 +2472,7 @@ bool dc_link_setup_psr(struct dc_link *link,
 {
        struct dc *dc;
        struct dmcu *dmcu;
+       struct dmub_psr *psr;
        int i;
        /* updateSinkPsrDpcdConfig*/
        union dpcd_psr_configuration psr_configuration;
@@ -2478,8 +2484,9 @@ bool dc_link_setup_psr(struct dc_link *link,
 
        dc = link->ctx->dc;
        dmcu = dc->res_pool->dmcu;
+       psr = dc->res_pool->psr;
 
-       if (!dmcu)
+       if (!dmcu && !psr)
                return false;
 
 
@@ -2588,7 +2595,10 @@ bool dc_link_setup_psr(struct dc_link *link,
         */
        psr_context->frame_delay = 0;
 
-       link->psr_feature_enabled = dmcu->funcs->setup_psr(dmcu, link, psr_context);
+       if (psr)
+               link->psr_feature_enabled = psr->funcs->setup_psr(psr, link, psr_context);
+       else
+               link->psr_feature_enabled = dmcu->funcs->setup_psr(dmcu, link, psr_context);
 
        /* psr_enabled == 0 indicates setup_psr did not succeed, but this
         * should not happen since firmware should be running at this point
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
new file mode 100644 (file)
index 0000000..225955e
--- /dev/null
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2019 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+
+#include "dmub_psr.h"
+#include "dc.h"
+#include "dc_dmub_srv.h"
+#include "../../dmub/inc/dmub_srv.h"
+#include "dmub_fw_state.h"
+#include "core_types.h"
+#include "ipp.h"
+
+#define MAX_PIPES 6
+
+/**
+ * Get PSR state from firmware.
+ */
+static void dmub_get_psr_state(uint32_t *psr_state)
+{
+       // Not yet implemented
+       // Trigger GPINT interrupt from firmware
+}
+
+/**
+ * Enable/Disable PSR.
+ */
+static void dmub_set_psr_enable(struct dmub_psr *dmub, bool enable)
+{
+       union dmub_rb_cmd cmd;
+       struct dc_context *dc = dmub->ctx;
+
+       cmd.psr_enable.header.type = DMUB_CMD__PSR;
+
+       if (enable)
+               cmd.psr_enable.header.sub_type = DMUB_CMD__PSR_ENABLE;
+       else
+               cmd.psr_enable.header.sub_type = DMUB_CMD__PSR_DISABLE;
+
+       cmd.psr_enable.header.payload_bytes = 0; // Send header only
+
+       dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.psr_enable.header);
+       dc_dmub_srv_cmd_execute(dc->dmub_srv);
+       dc_dmub_srv_wait_idle(dc->dmub_srv);
+}
+
+/**
+ * Set PSR level.
+ */
+static void dmub_set_psr_level(struct dmub_psr *dmub, uint16_t psr_level)
+{
+       union dmub_rb_cmd cmd;
+       uint32_t psr_state = 0;
+       struct dc_context *dc = dmub->ctx;
+
+       dmub_get_psr_state(&psr_state);
+
+       if (psr_state == 0)
+               return;
+
+       cmd.psr_set_level.header.type = DMUB_CMD__PSR;
+       cmd.psr_set_level.header.sub_type = DMUB_CMD__PSR_SET_LEVEL;
+       cmd.psr_set_level.header.payload_bytes = sizeof(struct dmub_cmd_psr_set_level_data);
+       cmd.psr_set_level.psr_set_level_data.psr_level = psr_level;
+
+       dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.psr_set_level.header);
+       dc_dmub_srv_cmd_execute(dc->dmub_srv);
+       dc_dmub_srv_wait_idle(dc->dmub_srv);
+}
+
+/**
+ * Setup PSR by programming phy registers and sending psr hw context values to firmware.
+ */
+static bool dmub_setup_psr(struct dmub_psr *dmub,
+               struct dc_link *link,
+               struct psr_context *psr_context)
+{
+       union dmub_rb_cmd cmd;
+       struct dc_context *dc = dmub->ctx;
+       struct dmub_cmd_psr_copy_settings_data *copy_settings_data
+               = &cmd.psr_copy_settings.psr_copy_settings_data;
+       struct pipe_ctx *pipe_ctx = NULL;
+       struct resource_context *res_ctx = &link->ctx->dc->current_state->res_ctx;
+
+       for (int i = 0; i < MAX_PIPES; i++) {
+               if (res_ctx &&
+                               res_ctx->pipe_ctx[i].stream &&
+                               res_ctx->pipe_ctx[i].stream->link &&
+                               res_ctx->pipe_ctx[i].stream->link == link &&
+                               res_ctx->pipe_ctx[i].stream->link->connector_signal == SIGNAL_TYPE_EDP) {
+                       pipe_ctx = &res_ctx->pipe_ctx[i];
+                       break;
+               }
+       }
+
+       if (!pipe_ctx ||
+                       !&pipe_ctx->plane_res ||
+                       !&pipe_ctx->stream_res)
+               return false;
+
+       // Program DP DPHY fast training registers
+       link->link_enc->funcs->psr_program_dp_dphy_fast_training(link->link_enc,
+                       psr_context->psrExitLinkTrainingRequired);
+
+       // Program DP_SEC_CNTL1 register to set transmission GPS0 line num and priority to high
+       link->link_enc->funcs->psr_program_secondary_packet(link->link_enc,
+                       psr_context->sdpTransmitLineNumDeadline);
+
+       cmd.psr_copy_settings.header.type = DMUB_CMD__PSR;
+       cmd.psr_copy_settings.header.sub_type = DMUB_CMD__PSR_COPY_SETTINGS;
+       cmd.psr_copy_settings.header.payload_bytes = sizeof(struct dmub_cmd_psr_copy_settings_data);
+
+       // Hw insts
+       copy_settings_data->dpphy_inst                          = psr_context->phyType;
+       copy_settings_data->aux_inst                            = psr_context->channel;
+       copy_settings_data->digfe_inst                          = psr_context->engineId;
+       copy_settings_data->digbe_inst                          = psr_context->transmitterId;
+
+       copy_settings_data->mpcc_inst                           = pipe_ctx->plane_res.mpcc_inst;
+
+       if (pipe_ctx->plane_res.hubp)
+               copy_settings_data->hubp_inst                   = pipe_ctx->plane_res.hubp->inst;
+       else
+               copy_settings_data->hubp_inst                   = 0;
+       if (pipe_ctx->plane_res.dpp)
+               copy_settings_data->dpp_inst                    = pipe_ctx->plane_res.dpp->inst;
+       else
+               copy_settings_data->dpp_inst                    = 0;
+       if (pipe_ctx->stream_res.opp)
+               copy_settings_data->opp_inst                    = pipe_ctx->stream_res.opp->inst;
+       else
+               copy_settings_data->opp_inst                    = 0;
+       if (pipe_ctx->stream_res.tg)
+               copy_settings_data->otg_inst                    = pipe_ctx->stream_res.tg->inst;
+       else
+               copy_settings_data->otg_inst                    = 0;
+
+       // Misc
+       copy_settings_data->psr_level                           = psr_context->psr_level.u32all;
+       copy_settings_data->hyst_frames                         = psr_context->timehyst_frames;
+       copy_settings_data->hyst_lines                          = psr_context->hyst_lines;
+       copy_settings_data->phy_type                            = psr_context->phyType;
+       copy_settings_data->aux_repeat                          = psr_context->aux_repeats;
+       copy_settings_data->smu_optimizations_en        = psr_context->allow_smu_optimizations;
+       copy_settings_data->skip_wait_for_pll_lock      = psr_context->skipPsrWaitForPllLock;
+       copy_settings_data->frame_delay                         = psr_context->frame_delay;
+       copy_settings_data->smu_phy_id                          = psr_context->smuPhyId;
+       copy_settings_data->num_of_controllers          = psr_context->numberOfControllers;
+       copy_settings_data->frame_cap_ind                       = psr_context->psrFrameCaptureIndicationReq;
+       copy_settings_data->phy_num                                     = psr_context->frame_delay & 0x7;
+       copy_settings_data->link_rate                           = psr_context->frame_delay & 0xF;
+
+       dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.psr_copy_settings.header);
+       dc_dmub_srv_cmd_execute(dc->dmub_srv);
+       dc_dmub_srv_wait_idle(dc->dmub_srv);
+
+       return true;
+}
+
+static const struct dmub_psr_funcs psr_funcs = {
+       .set_psr_enable                 = dmub_set_psr_enable,
+       .setup_psr                              = dmub_setup_psr,
+       .get_psr_state                  = dmub_get_psr_state,
+       .set_psr_level                  = dmub_set_psr_level,
+};
+
+/**
+ * Construct PSR object.
+ */
+static void dmub_psr_construct(struct dmub_psr *psr, struct dc_context *ctx)
+{
+       psr->ctx = ctx;
+       psr->funcs = &psr_funcs;
+}
+
+/**
+ * Allocate and initialize PSR object.
+ */
+struct dmub_psr *dmub_psr_create(struct dc_context *ctx)
+{
+       struct dmub_psr *psr = kzalloc(sizeof(struct dmub_psr), GFP_KERNEL);
+
+       if (psr == NULL) {
+               BREAK_TO_DEBUGGER();
+               return NULL;
+       }
+
+       dmub_psr_construct(psr, ctx);
+
+       return psr;
+}
+
+/**
+ * Deallocate PSR object.
+ */
+void dmub_psr_destroy(struct dmub_psr **dmub)
+{
+       kfree(dmub);
+       *dmub = NULL;
+}
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h
new file mode 100644 (file)
index 0000000..229958d
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-16 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+
+#ifndef _DMUB_PSR_H_
+#define _DMUB_PSR_H_
+
+#include "os_types.h"
+
+struct dmub_psr {
+       struct dc_context *ctx;
+       const struct dmub_psr_funcs *funcs;
+};
+
+struct dmub_psr_funcs {
+       void (*set_psr_enable)(struct dmub_psr *dmub, bool enable);
+       bool (*setup_psr)(struct dmub_psr *dmub, struct dc_link *link, struct psr_context *psr_context);
+       void (*get_psr_state)(uint32_t *psr_state);
+       void (*set_psr_level)(struct dmub_psr *dmub, uint16_t psr_level);
+};
+
+struct dmub_psr *dmub_psr_create(struct dc_context *ctx);
+void dmub_psr_destroy(struct dmub_psr **dmub);
+
+
+#endif /* _DCE_DMUB_H_ */
index 81e087e..0dd724d 100644 (file)
@@ -83,6 +83,7 @@
 #include "dcn21_resource.h"
 #include "vm_helper.h"
 #include "dcn20/dcn20_vmid.h"
+#include "../dce/dmub_psr.h"
 
 #define SOC_BOUNDING_BOX_VALID false
 #define DC_LOGGER_INIT(logger)
@@ -1744,6 +1745,10 @@ static bool dcn21_resource_construct(
                goto create_fail;
        }
 
+       // Leave as NULL to not affect current dmcu psr programming sequence
+       // Will be uncommented when functionality is confirmed to be working
+       pool->base.psr = NULL;
+
        pool->base.abm = dce_abm_create(ctx,
                        &abm_regs,
                        &abm_shift,
index 16f6ef2..f285b76 100644 (file)
@@ -212,6 +212,7 @@ struct resource_pool {
 
        struct abm *abm;
        struct dmcu *dmcu;
+       struct dmub_psr *psr;
 
        const struct resource_funcs *funcs;
        const struct resource_caps *res_cap;
index b10728f..d8fdf7e 100644 (file)
@@ -187,9 +187,28 @@ struct dmub_rb_cmd_dpphy_init {
 };
 
 struct dmub_cmd_psr_copy_settings_data {
-       uint32_t reg1;
-       uint32_t reg2;
-       uint32_t reg3;
+       uint16_t psr_level;
+       uint8_t hubp_inst;
+       uint8_t dpp_inst;
+       uint8_t mpcc_inst;
+       uint8_t opp_inst;
+       uint8_t otg_inst;
+       uint8_t digfe_inst;
+       uint8_t digbe_inst;
+       uint8_t dpphy_inst;
+       uint8_t aux_inst;
+       uint8_t hyst_frames;
+       uint8_t hyst_lines;
+       uint8_t phy_num;
+       uint8_t phy_type;
+       uint8_t aux_repeat;
+       uint8_t smu_optimizations_en;
+       uint8_t skip_wait_for_pll_lock;
+       uint8_t frame_delay;
+       uint8_t smu_phy_id;
+       uint8_t num_of_controllers;
+       uint8_t link_rate;
+       uint8_t frame_cap_ind;
 };
 
 struct dmub_rb_cmd_psr_copy_settings {
@@ -206,10 +225,6 @@ struct dmub_rb_cmd_psr_set_level {
        struct dmub_cmd_psr_set_level_data psr_set_level_data;
 };
 
-struct dmub_rb_cmd_psr_disable {
-       struct dmub_cmd_header header;
-};
-
 struct dmub_rb_cmd_psr_enable {
        struct dmub_cmd_header header;
 };
@@ -224,8 +239,8 @@ struct dmub_rb_cmd_notify_vblank {
 };
 
 struct dmub_cmd_psr_notify_static_state_data {
-       uint32_t ss_int;   // Which static screen interrupt was triggered
-       uint32_t ss_enter; // Enter (1) or exit (0) static screen
+       uint32_t ss_int;        // Which static screen interrupt was triggered
+       uint32_t ss_enter;      // Enter (1) or exit (0) static screen
 };
 
 struct dmub_rb_cmd_psr_notify_static_state {
@@ -245,7 +260,6 @@ union dmub_rb_cmd {
        struct dmub_rb_cmd_dpphy_init dpphy_init;
        struct dmub_rb_cmd_dig1_transmitter_control dig1_transmitter_control;
        struct dmub_rb_cmd_psr_enable psr_enable;
-       struct dmub_rb_cmd_psr_disable psr_disable;
        struct dmub_rb_cmd_psr_copy_settings psr_copy_settings;
        struct dmub_rb_cmd_psr_set_level psr_set_level;
 };