Further fix for NvOsLibraryLoad function calls #196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Programs which linked against both multimedia libs and libEGL_nvidia.so would end up with two versions of NvOsLibraryLoad and one of them would be used arbitrarily. Now, we rename the symbols to have unique names to avoid the conflict. This required a version of patchelf that is not yet in upstream nixpkgs. As an additional note, this was discovered when runnig the video_cuda_enc sample, and debugged using LD_DEBUG=all + grepping for NvOsLibraryLoad and seeing that it was coming from the libnvos_multimedia lib.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Programs which linked against both multimedia libs and libEGL_nvidia.so would end up with two versions of NvOsLibraryLoad and one of them would be used arbitrarily.
Now, we rename the symbols to have unique names to avoid the conflict. This required a version of patchelf that is not yet in upstream nixpkgs.
As an additional note, this was discovered when runnig the video_cuda_enc sample, and debugged using LD_DEBUG=all + grepping for NvOsLibraryLoad and seeing that it was coming from the libnvos_multimedia lib.
Testing
Tested by running combined-samples on a Xavier AGX devkit