On 17.05.2018 18:41, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> Set the interface version implemented by the gr3d module. This allows
> userspace to pass the correct command stream when programming the gr3d
> module.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
> ---
> drivers/gpu/drm/tegra/gr3d.c | 28 +++++++++++++++++++++++++---
> 1 file changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
> index 28c4ef63065b..0d4dce978eb2 100644
> --- a/drivers/gpu/drm/tegra/gr3d.c
> +++ b/drivers/gpu/drm/tegra/gr3d.c
> @@ -10,6 +10,7 @@
> #include <linux/clk.h>
> #include <linux/host1x.h>
> #include <linux/module.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/reset.h>
>
> @@ -19,6 +20,10 @@
> #include "gem.h"
> #include "gr3d.h"
>
> +struct gr3d_soc {
> + unsigned int version;
> +};
> +
> struct gr3d {
> struct tegra_drm_client client;
> struct host1x_channel *channel;
> @@ -27,6 +32,8 @@ struct gr3d {
> struct reset_control *rst_secondary;
> struct reset_control *rst;
>
> + const struct gr3d_soc *soc;
> +
> DECLARE_BITMAP(addr_regs, GR3D_NUM_REGS);
> };
>
> @@ -125,10 +132,22 @@ static const struct tegra_drm_client_ops gr3d_ops = {
> .submit = tegra_drm_submit,
> };
>
> +static const struct gr3d_soc tegra20_gr3d_soc = {
> + .version = 0x20,
> +};
> +
> +static const struct gr3d_soc tegra30_gr3d_soc = {
> + .version = 0x30,
> +};
> +
> +static const struct gr3d_soc tegra114_gr3d_soc = {
> + .version = 0x35,
> +};
> +
> static const struct of_device_id tegra_gr3d_match[] = {
> - { .compatible = "nvidia,tegra114-gr3d" },
> - { .compatible = "nvidia,tegra30-gr3d" },
> - { .compatible = "nvidia,tegra20-gr3d" },
> + { .compatible = "nvidia,tegra114-gr3d", .data = &tegra114_gr3d_soc },
> + { .compatible = "nvidia,tegra30-gr3d", .data = &tegra30_gr3d_soc },
> + { .compatible = "nvidia,tegra20-gr3d", .data = &tegra20_gr3d_soc },
> { }
> };
> MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
> @@ -250,6 +269,8 @@ static int gr3d_probe(struct platform_device *pdev)
> if (!gr3d)
> return -ENOMEM;
>
> + gr3d->soc = of_device_get_match_data(&pdev->dev);
> +
> syncpts = devm_kzalloc(&pdev->dev, sizeof(*syncpts), GFP_KERNEL);
> if (!syncpts)
> return -ENOMEM;
> @@ -303,6 +324,7 @@ static int gr3d_probe(struct platform_device *pdev)
> gr3d->client.base.ops = &gr3d_client_ops;
> gr3d->client.base.dev = &pdev->dev;
> gr3d->client.base.class = HOST1X_CLASS_GR3D;
> + gr3d->client.base.version = gr3d->soc->version;
> gr3d->client.base.syncpts = syncpts;
> gr3d->client.base.num_syncpts = 1;
>
>
Reviewed-by: Dmitry Osipenko <digetx@xxxxxxxxx>
Tested-by: Dmitry Osipenko <digetx@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
