drm/vc4: Make v3d paths unavailable on any generation newer than vc4

The V3D IP has been separate since BCM2711, so let's make sure we issue
a WARN if we're running not only on BCM2711, but also anything newer.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240621152055.4180873-22-dave.stevenson@raspberrypi.com
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index 2a85d08b19852a090e56a092f94d611130af63ed..fb450b6a4d444c4f7661c87b24731ae0bceebc19 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -251,7 +251,7 @@ void vc4_bo_add_to_purgeable_pool(struct vc4_bo *bo)
 {
        struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        mutex_lock(&vc4->purgeable.lock);
@@ -265,7 +265,7 @@ static void vc4_bo_remove_from_purgeable_pool_locked(struct vc4_bo *bo)
 {
        struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        /* list_del_init() is used here because the caller might release
@@ -396,7 +396,7 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_bo *bo;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return ERR_PTR(-ENODEV);
 
        bo = kzalloc(sizeof(*bo), GFP_KERNEL);
@@ -427,7 +427,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size,
        struct drm_gem_dma_object *dma_obj;
        struct vc4_bo *bo;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return ERR_PTR(-ENODEV);
 
        if (size == 0)
@@ -496,7 +496,7 @@ int vc4_bo_dumb_create(struct drm_file *file_priv,
        struct vc4_bo *bo = NULL;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        ret = vc4_dumb_fixup_args(args);
@@ -622,7 +622,7 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo)
        struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        /* Fast path: if the BO is already retained by someone, no need to
@@ -661,7 +661,7 @@ void vc4_bo_dec_usecnt(struct vc4_bo *bo)
 {
        struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        /* Fast path: if the BO is still retained by someone, no need to test
@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_device *dev, void *data,
        struct vc4_bo *bo = NULL;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        ret = vc4_grab_bin_bo(vc4, vc4file);
@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device *dev, void *data,
        struct drm_vc4_mmap_bo *args = data;
        struct drm_gem_object *gem_obj;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        gem_obj = drm_gem_object_lookup(file_priv, args->handle);
@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,
        struct vc4_bo *bo = NULL;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (args->size == 0)
@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_device *dev, void *data,
        struct vc4_bo *bo;
        bool t_format;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (args->flags != 0)
@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_device *dev, void *data,
        struct drm_gem_object *gem_obj;
        struct vc4_bo *bo;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (args->flags != 0 || args->modifier != 0)
@@ -1007,7 +1007,7 @@ int vc4_bo_cache_init(struct drm_device *dev)
        int ret;
        int i;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        /* Create the initial set of BO labels that the kernel will
@@ -1071,7 +1071,7 @@ int vc4_label_bo_ioctl(struct drm_device *dev, void *data,
        struct drm_gem_object *gem_obj;
        int ret = 0, label;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!args->len)

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 7220c4a62e1292db91739332db5485f95342bc71..575900ee67a5f445cf3ca5b271ba03d1c5f20ad5 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -1008,7 +1008,7 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
        struct vc4_bo *bo = to_vc4_bo(&dma_bo->base);
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        /*
@@ -1051,7 +1051,7 @@ int vc4_page_flip(struct drm_crtc *crtc,
                struct drm_device *dev = crtc->dev;
                struct vc4_dev *vc4 = to_vc4_dev(dev);
 
-               if (vc4->gen == VC4_GEN_5)
+               if (vc4->gen > VC4_GEN_4)
                        return vc5_async_page_flip(crtc, fb, event, flags);
                else
                        return vc4_async_page_flip(crtc, fb, event, flags);

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 550324819f37fc35790d6b561132ed8c0c091b38..8c104ace3dc6ec36fd6fc031d3786b6b6988bbb3 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -98,7 +98,7 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data,
        if (args->pad != 0)
                return -EINVAL;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d)
@@ -147,7 +147,7 @@ static int vc4_open(struct drm_device *dev, struct drm_file *file)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_file *vc4file;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        vc4file = kzalloc(sizeof(*vc4file), GFP_KERNEL);
@@ -165,7 +165,7 @@ static void vc4_close(struct drm_device *dev, struct drm_file *file)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_file *vc4file = file->driver_priv;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (vc4file->bin_bo_used)
@@ -301,7 +301,7 @@ static int vc4_drm_bind(struct device *dev)
        else
                gen = VC4_GEN_4;
 
-       if (gen == VC4_GEN_5)
+       if (gen > VC4_GEN_4)
                driver = &vc5_drm_driver;
        else
                driver = &vc4_drm_driver;

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index be9c0b72ebe869554c424a07e89189ffd02d6542..22bccd69eb629948bd3c33a850e2bb096288fe28 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_device *dev, void *data,
        u32 i;
        int ret = 0;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d) {
@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *dev, uint64_t seqno, uint64_t timeout_ns,
        unsigned long timeout_expire;
        DEFINE_WAIT(wait);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (vc4->finished_seqno >= seqno)
@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_device *dev)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_exec_info *exec;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
 again:
@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_device *dev)
        if (!exec)
                return;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        /* A previous RCL may have written to one of our textures, and
@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device *dev, struct vc4_exec_info *exec)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        bool was_empty = list_empty(&vc4->render_job_list);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        list_move_tail(&exec->head, &vc4->render_job_list);
@@ -970,7 +970,7 @@ vc4_job_handle_completed(struct vc4_dev *vc4)
        unsigned long irqflags;
        struct vc4_seqno_cb *cb, *cb_temp;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        spin_lock_irqsave(&vc4->job_lock, irqflags);
@@ -1009,7 +1009,7 @@ int vc4_queue_seqno_cb(struct drm_device *dev,
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        unsigned long irqflags;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        cb->func = func;
@@ -1065,7 +1065,7 @@ vc4_wait_seqno_ioctl(struct drm_device *dev, void *data,
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct drm_vc4_wait_seqno *args = data;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno,
@@ -1082,7 +1082,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev, void *data,
        struct drm_gem_object *gem_obj;
        struct vc4_bo *bo;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (args->pad != 0)
@@ -1131,7 +1131,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
                                  args->shader_rec_size,
                                  args->bo_handle_count);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d) {
@@ -1267,7 +1267,7 @@ int vc4_gem_init(struct drm_device *dev)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        vc4->dma_fence_context = dma_fence_context_alloc(1);
@@ -1326,7 +1326,7 @@ int vc4_gem_madvise_ioctl(struct drm_device *dev, void *data,
        struct vc4_bo *bo;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        switch (args->madv) {

diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c
index 968356d1b91dfbac1a1fc9a8f02970c8385a8419..69b399f3b8027c0ce2dbc46ac3596c85fbf19c46 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_irq.c
+++ b/drivers/gpu/drm/vc4/vc4_irq.c
@@ -263,7 +263,7 @@ vc4_irq_enable(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (!vc4->v3d)
@@ -280,7 +280,7 @@ vc4_irq_disable(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (!vc4->v3d)
@@ -303,7 +303,7 @@ int vc4_irq_install(struct drm_device *dev, int irq)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (irq == IRQ_NOTCONNECTED)
@@ -324,7 +324,7 @@ void vc4_irq_uninstall(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        vc4_irq_disable(dev);
@@ -337,7 +337,7 @@ void vc4_irq_reset(struct drm_device *dev)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        unsigned long irqflags;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        /* Acknowledge any stale IRQs. */

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index bddfcad1095013c64d94a4781612f3c12294d9a7..58bbb9efc2dfa0fe034f6d7ddc087d7478152f49 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -461,7 +461,7 @@ static struct drm_framebuffer *vc4_fb_create(struct drm_device *dev,
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct drm_mode_fb_cmd2 mode_cmd_local;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return ERR_PTR(-ENODEV);
 
        /* If the user didn't specify a modifier, use the

diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c
index 31ee7ef802746cca9c49df4106c1b3e887bf0149..4cd3643c3ba753da93d570dab90f38731b7bc7d8 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_perfmon.c
+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
@@ -23,7 +23,7 @@ void vc4_perfmon_get(struct vc4_perfmon *perfmon)
                return;
 
        vc4 = perfmon->dev;
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        refcount_inc(&perfmon->refcnt);
@@ -37,7 +37,7 @@ void vc4_perfmon_put(struct vc4_perfmon *perfmon)
                return;
 
        vc4 = perfmon->dev;
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (refcount_dec_and_test(&perfmon->refcnt))
@@ -49,7 +49,7 @@ void vc4_perfmon_start(struct vc4_dev *vc4, struct vc4_perfmon *perfmon)
        unsigned int i;
        u32 mask;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (WARN_ON_ONCE(!perfmon || vc4->active_perfmon))
@@ -69,7 +69,7 @@ void vc4_perfmon_stop(struct vc4_dev *vc4, struct vc4_perfmon *perfmon,
 {
        unsigned int i;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        if (WARN_ON_ONCE(!vc4->active_perfmon ||
@@ -90,7 +90,7 @@ struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id)
        struct vc4_dev *vc4 = vc4file->dev;
        struct vc4_perfmon *perfmon;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return NULL;
 
        mutex_lock(&vc4file->perfmon.lock);
@@ -105,7 +105,7 @@ void vc4_perfmon_open_file(struct vc4_file *vc4file)
 {
        struct vc4_dev *vc4 = vc4file->dev;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        mutex_init(&vc4file->perfmon.lock);
@@ -126,7 +126,7 @@ void vc4_perfmon_close_file(struct vc4_file *vc4file)
 {
        struct vc4_dev *vc4 = vc4file->dev;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        mutex_lock(&vc4file->perfmon.lock);
@@ -146,7 +146,7 @@ int vc4_perfmon_create_ioctl(struct drm_device *dev, void *data,
        unsigned int i;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d) {
@@ -200,7 +200,7 @@ int vc4_perfmon_destroy_ioctl(struct drm_device *dev, void *data,
        struct drm_vc4_perfmon_destroy *req = data;
        struct vc4_perfmon *perfmon;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d) {
@@ -228,7 +228,7 @@ int vc4_perfmon_get_values_ioctl(struct drm_device *dev, void *data,
        struct vc4_perfmon *perfmon;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (!vc4->v3d) {

diff --git a/drivers/gpu/drm/vc4/vc4_render_cl.c b/drivers/gpu/drm/vc4/vc4_render_cl.c
index ae4ad956f04ff8215585f6364c1885bcf846e153..14079853338ebd867cd6396af29864dcb2dac231 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_render_cl.c
+++ b/drivers/gpu/drm/vc4/vc4_render_cl.c
@@ -599,7 +599,7 @@ int vc4_get_rcl(struct drm_device *dev, struct vc4_exec_info *exec)
        bool has_bin = args->bin_cl_size != 0;
        int ret;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        if (args->min_x_tile > args->max_x_tile ||

diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index 43f69d74e8761da0b2e68044cb3e3aab0d85adbc..2423826c89eb6c4695378b5fe0d4671569b45dcf 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -127,7 +127,7 @@ static int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused)
 int
 vc4_v3d_pm_get(struct vc4_dev *vc4)
 {
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        mutex_lock(&vc4->power_lock);
@@ -148,7 +148,7 @@ vc4_v3d_pm_get(struct vc4_dev *vc4)
 void
 vc4_v3d_pm_put(struct vc4_dev *vc4)
 {
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        mutex_lock(&vc4->power_lock);
@@ -178,7 +178,7 @@ int vc4_v3d_get_bin_slot(struct vc4_dev *vc4)
        uint64_t seqno = 0;
        struct vc4_exec_info *exec;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
 try_again:
@@ -325,7 +325,7 @@ int vc4_v3d_bin_bo_get(struct vc4_dev *vc4, bool *used)
 {
        int ret = 0;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        mutex_lock(&vc4->bin_bo_lock);
@@ -360,7 +360,7 @@ static void bin_bo_release(struct kref *ref)
 
 void vc4_v3d_bin_bo_put(struct vc4_dev *vc4)
 {
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return;
 
        mutex_lock(&vc4->bin_bo_lock);

diff --git a/drivers/gpu/drm/vc4/vc4_validate.c b/drivers/gpu/drm/vc4/vc4_validate.c
index f3d7fdbe9083c5175d8b5f430c7608c6350594ef..5bf134968adecfc6fd2964a32836a61c011d0dfa 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_validate.c
+++ b/drivers/gpu/drm/vc4/vc4_validate.c
@@ -109,7 +109,7 @@ vc4_use_bo(struct vc4_exec_info *exec, uint32_t hindex)
        struct drm_gem_dma_object *obj;
        struct vc4_bo *bo;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return NULL;
 
        if (hindex >= exec->bo_count) {
@@ -169,7 +169,7 @@ vc4_check_tex_size(struct vc4_exec_info *exec, struct drm_gem_dma_object *fbo,
        uint32_t utile_w = utile_width(cpp);
        uint32_t utile_h = utile_height(cpp);
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return false;
 
        /* The shaded vertex format stores signed 12.4 fixed point
@@ -495,7 +495,7 @@ vc4_validate_bin_cl(struct drm_device *dev,
        uint32_t dst_offset = 0;
        uint32_t src_offset = 0;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        while (src_offset < len) {
@@ -942,7 +942,7 @@ vc4_validate_shader_recs(struct drm_device *dev,
        uint32_t i;
        int ret = 0;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return -ENODEV;
 
        for (i = 0; i < exec->shader_state_count; i++) {

diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
index afb1a4d826846521649c4ae8b55f9082b4e6ec97..2d74e786914cb39497a26a2a6962d175362eb1cd 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c
+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
@@ -786,7 +786,7 @@ vc4_validate_shader(struct drm_gem_dma_object *shader_obj)
        struct vc4_validated_shader_info *validated_shader = NULL;
        struct vc4_shader_validation_state validation_state;
 
-       if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
+       if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
                return NULL;
 
        memset(&validation_state, 0, sizeof(validation_state));