Skip to content

Commit

Permalink
drm/tegra: vic: Track interface version
Browse files Browse the repository at this point in the history
Set the interface version implemented by the VIC module. This allows
userspace to pass the correct command stream when programming the VIC
module.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
Thierry Reding committed May 18, 2018
1 parent 33f150e commit acae8a9
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/gpu/drm/tegra/vic.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

struct vic_config {
const char *firmware;
unsigned int version;
};

struct vic {
Expand Down Expand Up @@ -264,18 +265,21 @@ static const struct tegra_drm_client_ops vic_ops = {

static const struct vic_config vic_t124_config = {
.firmware = NVIDIA_TEGRA_124_VIC_FIRMWARE,
.version = 0x40,
};

#define NVIDIA_TEGRA_210_VIC_FIRMWARE "nvidia/tegra210/vic04_ucode.bin"

static const struct vic_config vic_t210_config = {
.firmware = NVIDIA_TEGRA_210_VIC_FIRMWARE,
.version = 0x21,
};

#define NVIDIA_TEGRA_186_VIC_FIRMWARE "nvidia/tegra186/vic04_ucode.bin"

static const struct vic_config vic_t186_config = {
.firmware = NVIDIA_TEGRA_186_VIC_FIRMWARE,
.version = 0x18,
};

static const struct of_device_id vic_match[] = {
Expand Down Expand Up @@ -342,6 +346,7 @@ static int vic_probe(struct platform_device *pdev)
vic->dev = dev;

INIT_LIST_HEAD(&vic->client.list);
vic->client.version = vic->config->version;
vic->client.ops = &vic_ops;

err = host1x_client_register(&vic->client.base);
Expand Down

0 comments on commit acae8a9

Please sign in to comment.