drm/tegra: Implement stream ID related callbacks on engines

Implement the get_streamid_offset and can_use_memory_ctx callbacks
required for supporting context isolation. Since old firmware on VIC
cannot support context isolation without hacks that we don't want to
implement, check the firmware binary to see if context isolation
should be enabled.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 2acc8f2948adea7e54cd3a9394b321b657d630d8..845e60f144c71079521e87889bbb967ad0fbc553 100644 (file)
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -100,6 +100,14 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                     struct drm_tegra_submit *args, struct drm_device *drm,
                     struct drm_file *file);
 
+static inline int
+tegra_drm_get_streamid_offset_thi(struct tegra_drm_client *client, u32 *offset)
+{
+       *offset = 0x30;
+
+       return 0;
+}
+
 struct tegra_drm_client {
        struct host1x_client base;
        struct list_head list;

diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c
index 386f9b2e78c41fc30b6e683509b806c9c3f1ac9b..a84f617096792417adafbce019081ec2bb689585 100644 (file)
--- a/drivers/gpu/drm/tegra/nvdec.c
+++ b/drivers/gpu/drm/tegra/nvdec.c
@@ -306,10 +306,19 @@ static void nvdec_close_channel(struct tegra_drm_context *context)
        host1x_channel_put(context->channel);
 }
 
+static int nvdec_can_use_memory_ctx(struct tegra_drm_client *client, bool *supported)
+{
+       *supported = true;
+
+       return 0;
+}
+
 static const struct tegra_drm_client_ops nvdec_ops = {
        .open_channel = nvdec_open_channel,
        .close_channel = nvdec_close_channel,
        .submit = tegra_drm_submit,
+       .get_streamid_offset = tegra_drm_get_streamid_offset_thi,
+       .can_use_memory_ctx = nvdec_can_use_memory_ctx,
 };
 
 #define NVIDIA_TEGRA_210_NVDEC_FIRMWARE "nvidia/tegra210/nvdec.bin"

diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index f56f5921a8c25ffa684de68b21b7e46849c7d496..c5526bda88d663904af568907e57292fb62e29e9 100644 (file)
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -38,6 +38,8 @@ struct vic {
        struct clk *clk;
        struct reset_control *rst;
 
+       bool can_use_context;
+
        /* Platform configuration */
        const struct vic_config *config;
 };
@@ -229,28 +231,38 @@ static int vic_load_firmware(struct vic *vic)
 {
        struct host1x_client *client = &vic->client.base;
        struct tegra_drm *tegra = vic->client.drm;
+       static DEFINE_MUTEX(lock);
+       u32 fce_bin_data_offset;
        dma_addr_t iova;
        size_t size;
        void *virt;
        int err;
 
-       if (vic->falcon.firmware.virt)
-               return 0;
+       mutex_lock(&lock);
+
+       if (vic->falcon.firmware.virt) {
+               err = 0;
+               goto unlock;
+       }
 
        err = falcon_read_firmware(&vic->falcon, vic->config->firmware);
        if (err < 0)
-               return err;
+               goto unlock;
 
        size = vic->falcon.firmware.size;
 
        if (!client->group) {
                virt = dma_alloc_coherent(vic->dev, size, &iova, GFP_KERNEL);
-               if (!virt)
-                       return -ENOMEM;
+               if (!virt) {
+                       err = -ENOMEM;
+                       goto unlock;
+               }
        } else {
                virt = tegra_drm_alloc(tegra, size, &iova);
-               if (IS_ERR(virt))
-                       return PTR_ERR(virt);
+               if (IS_ERR(virt)) {
+                       err = PTR_ERR(virt);
+                       goto unlock;
+               }
        }
 
        vic->falcon.firmware.virt = virt;
@@ -277,7 +289,28 @@ static int vic_load_firmware(struct vic *vic)
                vic->falcon.firmware.phys = phys;
        }
 
-       return 0;
+       /*
+        * Check if firmware is new enough to not require mapping firmware
+        * to data buffer domains.
+        */
+       fce_bin_data_offset = *(u32 *)(virt + VIC_UCODE_FCE_DATA_OFFSET);
+
+       if (!vic->config->supports_sid) {
+               vic->can_use_context = false;
+       } else if (fce_bin_data_offset != 0x0 && fce_bin_data_offset != 0xa5a5a5a5) {
+               /*
+                * Firmware will access FCE through STREAMID0, so context
+                * isolation cannot be used.
+                */
+               vic->can_use_context = false;
+               dev_warn_once(vic->dev, "context isolation disabled due to old firmware\n");
+       } else {
+               vic->can_use_context = true;
+       }
+
+unlock:
+       mutex_unlock(&lock);
+       return err;
 
 cleanup:
        if (!client->group)
@@ -285,6 +318,7 @@ cleanup:
        else
                tegra_drm_free(tegra, size, virt, iova);
 
+       mutex_unlock(&lock);
        return err;
 }
 
@@ -358,10 +392,27 @@ static void vic_close_channel(struct tegra_drm_context *context)
        host1x_channel_put(context->channel);
 }
 
+static int vic_can_use_memory_ctx(struct tegra_drm_client *client, bool *supported)
+{
+       struct vic *vic = to_vic(client);
+       int err;
+
+       /* This doesn't access HW so it's safe to call without powering up. */
+       err = vic_load_firmware(vic);
+       if (err < 0)
+               return err;
+
+       *supported = vic->can_use_context;
+
+       return 0;
+}
+
 static const struct tegra_drm_client_ops vic_ops = {
        .open_channel = vic_open_channel,
        .close_channel = vic_close_channel,
        .submit = tegra_drm_submit,
+       .get_streamid_offset = tegra_drm_get_streamid_offset_thi,
+       .can_use_memory_ctx = vic_can_use_memory_ctx,
 };
 
 #define NVIDIA_TEGRA_124_VIC_FIRMWARE "nvidia/tegra124/vic03_ucode.bin"