| Message ID | 20240620063313.2309767-1-alexander.stein@ew.tq-group.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] media: verisilicon: Move rockchip hardware drivers to the corresponding option | expand |
Hi, Le jeudi 20 juin 2024 à 08:33 +0200, Alexander Stein a écrit : > There is no need to compile the rockchip specific drivers if > CONFIG_VIDEO_HANTRO_ROCKCHIP is not set. > All driver functions are only referenced by rockchip_vpu_hw.c which is > already under this option. > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Thanks, just like many bugfix, its nice to see backported, but this can happen without Fixes tag. To make this more convenient, would you mind splitting this change in 2 parts: > --- > drivers/media/platform/verisilicon/Makefile | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile > index eb38a1833b02..f6f019d04ff0 100644 > --- a/drivers/media/platform/verisilicon/Makefile > +++ b/drivers/media/platform/verisilicon/Makefile > @@ -14,13 +14,6 @@ hantro-vpu-y += \ > hantro_g2.o \ > hantro_g2_hevc_dec.o \ > hantro_g2_vp9_dec.o \ > - rockchip_vpu2_hw_jpeg_enc.o \ > - rockchip_vpu2_hw_h264_dec.o \ > - rockchip_vpu2_hw_mpeg2_dec.o \ > - rockchip_vpu2_hw_vp8_dec.o \ This got merged in 5.3, so that would be patch 1/2, with: Fixes: c9caebd57b3a ("media: hantro: merge Rockchip platform drivers") Fixes: c07665f99386 ("media: hantro: Add H.264 support for Rockchip VDPU2") The first Fixes is not fully accurate, but should do. > - rockchip_vpu981_hw_av1_dec.o \ > - rockchip_av1_filmgrain.o \ > - rockchip_av1_entropymode.o \ This got merged in 6.3, so that would be patch 2/2, with: Fixes: 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder") Fixes: d8ebe59e7b36 ("media: verisilicon: Add film grain feature to AV1 driver") Fixes: c0d0e579db4e ("media: verisilicon: Add AV1 entropy helpers") With this minor change, you can also add: Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > > hantro_jpeg.o \ > hantro_h264.o \ > hantro_hevc.o \ > @@ -35,6 +28,13 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_SAMA5D4) += \ > sama5d4_vdec_hw.o > > hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \ > + rockchip_vpu2_hw_jpeg_enc.o \ > + rockchip_vpu2_hw_h264_dec.o \ > + rockchip_vpu2_hw_mpeg2_dec.o \ > + rockchip_vpu2_hw_vp8_dec.o \ > + rockchip_vpu981_hw_av1_dec.o \ > + rockchip_av1_filmgrain.o \ > + rockchip_av1_entropymode.o \ > rockchip_vpu_hw.o > > hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \
diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile index eb38a1833b02..f6f019d04ff0 100644 --- a/drivers/media/platform/verisilicon/Makefile +++ b/drivers/media/platform/verisilicon/Makefile @@ -14,13 +14,6 @@ hantro-vpu-y += \ hantro_g2.o \ hantro_g2_hevc_dec.o \ hantro_g2_vp9_dec.o \ - rockchip_vpu2_hw_jpeg_enc.o \ - rockchip_vpu2_hw_h264_dec.o \ - rockchip_vpu2_hw_mpeg2_dec.o \ - rockchip_vpu2_hw_vp8_dec.o \ - rockchip_vpu981_hw_av1_dec.o \ - rockchip_av1_filmgrain.o \ - rockchip_av1_entropymode.o \ hantro_jpeg.o \ hantro_h264.o \ hantro_hevc.o \ @@ -35,6 +28,13 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_SAMA5D4) += \ sama5d4_vdec_hw.o hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \ + rockchip_vpu2_hw_jpeg_enc.o \ + rockchip_vpu2_hw_h264_dec.o \ + rockchip_vpu2_hw_mpeg2_dec.o \ + rockchip_vpu2_hw_vp8_dec.o \ + rockchip_vpu981_hw_av1_dec.o \ + rockchip_av1_filmgrain.o \ + rockchip_av1_entropymode.o \ rockchip_vpu_hw.o hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \
There is no need to compile the rockchip specific drivers if CONFIG_VIDEO_HANTRO_ROCKCHIP is not set. All driver functions are only referenced by rockchip_vpu_hw.c which is already under this option. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- drivers/media/platform/verisilicon/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)