Skip to content

Commit

Permalink
drm/amd/display: provide an interface to query firmware version
Browse files Browse the repository at this point in the history
Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Anthony Koo authored and Alex Deucher committed Feb 19, 2018
1 parent 41b5b0a commit e923a35
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
7 changes: 7 additions & 0 deletions drivers/gpu/drm/amd/display/dc/core/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "bios_parser_interface.h"
#include "include/irq_service_interface.h"
#include "transform.h"
#include "dmcu.h"
#include "dpp.h"
#include "timing_generator.h"
#include "virtual/virtual_link_encoder.h"
Expand Down Expand Up @@ -609,6 +610,12 @@ struct dc *dc_create(const struct dc_init_data *init_params)
dc->caps.max_audios = dc->res_pool->audio_count;
dc->caps.linear_pitch_alignment = 64;

/* Populate versioning information */
dc->versions.dc_ver = DC_VER;

if (dc->res_pool->dmcu != NULL)
dc->versions.dmcu_version = dc->res_pool->dmcu->dmcu_version;

dc->config = init_params->flags;

dm_logger_write(dc->ctx->logger, LOG_DC,
Expand Down
13 changes: 13 additions & 0 deletions drivers/gpu/drm/amd/display/dc/dc.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@
/*******************************************************************************
* Display Core Interfaces
******************************************************************************/
struct dmcu_version {
unsigned int date;
unsigned int month;
unsigned int year;
unsigned int interface_version;
};

struct dc_versions {
const char *dc_ver;
struct dmcu_version dmcu_version;
};

struct dc_caps {
uint32_t max_streams;
uint32_t max_links;
Expand Down Expand Up @@ -221,6 +233,7 @@ struct dc_state;
struct resource_pool;
struct dce_hwseq;
struct dc {
struct dc_versions versions;
struct dc_caps caps;
struct dc_cap_funcs cap_funcs;
struct dc_config config;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static void dcn10_get_dmcu_version(struct dmcu *dmcu)
dmcu->dmcu_version.year = ((REG_READ(DMCU_IRAM_RD_DATA) << 8) |
REG_READ(DMCU_IRAM_RD_DATA));
dmcu->dmcu_version.month = REG_READ(DMCU_IRAM_RD_DATA);
dmcu->dmcu_version.day = REG_READ(DMCU_IRAM_RD_DATA);
dmcu->dmcu_version.date = REG_READ(DMCU_IRAM_RD_DATA);

/* Disable write access to IRAM to allow dynamic sleep state */
REG_UPDATE_2(DMCU_RAM_ACCESS_CTRL,
Expand Down
7 changes: 0 additions & 7 deletions drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ enum dmcu_state {
DMCU_RUNNING = 1
};

struct dmcu_version {
unsigned int day;
unsigned int month;
unsigned int year;
unsigned int interface_version;
};

struct dmcu {
struct dc_context *ctx;
const struct dmcu_funcs *funcs;
Expand Down

0 comments on commit e923a35

Please sign in to comment.