Hi,

On 14/11/2026 03:05, Jiaxing Hu wrote:
> # Conflicts:
> #     drivers/accel/rocket/rocket_core.c
> #     drivers/accel/rocket/rocket_core.h

This needs to be removed from the commit message.


> diff --git a/drivers/accel/rocket/rocket_device.c 
> b/drivers/accel/rocket/rocket_device.c
> index db137e2ec15e..868af86d00ce 100644
> --- a/drivers/accel/rocket/rocket_device.c
> +++ b/drivers/accel/rocket/rocket_device.c
> @@ -9,6 +9,7 @@
>  #include <linux/of.h>
>  
>  #include "rocket_device.h"
> +#include "rocket_drv.h"
>  
>  struct rocket_device *rocket_device_init(struct platform_device *pdev,
>                                        const struct drm_driver 
> *rocket_drm_driver)
> @@ -27,7 +28,7 @@ struct rocket_device *rocket_device_init(struct 
> platform_device *pdev,
>       ddev = &rdev->ddev;
>       dev_set_drvdata(dev, rdev);
>  
> -     for_each_compatible_node(core_node, NULL, "rockchip,rk3588-rknn-core")
> +     for_each_matching_node(core_node, rocket_dt_match)
>               if (of_device_is_available(core_node))
>                       num_cores++;

I think it would be a little cleaner to do the counting in rocket_drv.c,
and pass it in as a parameter to rocket_device_init().
Then you don't need to share the dt_match over two files.

> diff --git a/drivers/accel/rocket/rocket_job.c 
> b/drivers/accel/rocket/rocket_job.c
> index 68df1596014e..59a6f548e108 100644
> --- a/drivers/accel/rocket/rocket_job.c
> +++ b/drivers/accel/rocket/rocket_job.c
> @@ -31,6 +31,11 @@
>  /* Bits 3:0 of PC_BASE_ADDRESS hold the mode selection bit and reserved bits 
> */
>  #define ROCKET_REGCMD_ALIGN  16
>  
> +#define RK3576_PC_TASK_CON_TASK_NUMBER(n)    ((n) & 0xffff)
> +#define RK3576_PC_TASK_CON_PP_EN             BIT(16)
> +#define RK3576_PC_TASK_CON_COUNT_CLEAR               BIT(17)
> +#define RK3576_PC_TASK_CON_LAST_LAYER_CLEAR  BIT(18)

This introduces an inconsistency in the way registers are handled. All
other reg definitions are in rocket_registers.h (originating from mesa
xml) but this one is placed here.

I think you should add it to mesa as some kind of register variant, and
then regenerate rocket_registers.h

Reply via email to