search

IntelRealSense / realsense_mipi_platform_driver

Intel® RealSense™ camera driver for GMSL* interface
GNU General Public License v2.0
15 stars 12 forks source link

Align Jetpack-5.0.2 branch with master #146

Closed jnzw closed 1 year ago

jnzw commented 1 year ago

JP4.6.1 Changes in patches numbered 0073, 0074, 0075 were already in d4xx.c (for JP5.0.2), only thing new is the version bump in 0076.

dmipx commented 1 year ago

JP4.6.1 Changes in patches numbered 0073, 0074, 0075 were already in d4xx.c (for JP5.0.2), only thing new is the version bump in 0076.

Isn't d4xx.c maintained for both - jp4 and jp5? do we need these patches for jp4?

dmipx commented 1 year ago

@jnzw please maintain d4xx for jp4 as we already did in dev branch https://github.com/IntelRealSense/perc_hw_ds5u_android-jetson_tx2/blob/72f6c3b59a79c068fcf6a167b6e3719600b7e73e/apply_patches_ext.sh#L29 if [[ $JETPACK_VERSION =~ 5.* ]]; then

jnzw commented 1 year ago

Isn't d4xx.c maintained for both - jp4 and jp5? do we need these patches for jp4?

No, for current Jetpack-5.0.2 branch, d4xx.c (the single file that is now at the top level of the repo) is maintained only for jetpack 5. As for jetpack 4, d4xx.c is generated by running the apply_patches.sh script, so these patches are still needed (I only moved them to the new directory kernel/nvidia/4.6.1 instead of kernel/nvidia)

please maintain d4xx for jp4 as we already did in dev branch

~In the dev branch since you have also created a separate d4xx.c file, I think you can just delete the patch files under kernel/nvidia and it would still work the same.~ To maintain only one d4xx.c file regardless of the jetpack version isn't so straightforward because remember there were some changes introduced when porting to jp5, I'll need to do a diff and look into it.

xzhangxa commented 1 year ago

@jnzw please maintain d4xx for jp4 as we already did in dev branch

This PR is only to merge missing commits in master to JetPack-5.0.2 branch, so this shouldn't be done here. Maybe you can do it when merging the dev branch later or in a separate PR?

xzhangxa commented 1 year ago

Actually, a clearer way is to rebase branch JetPack-5.0.2 on top of master and just add the version change (since all other changes were already in d4xx.c of this branch according to Junze).