Yes, open your 2020 amended return. Then you should be able to add your 2021 Form 1099-R with codes P and J.
Please see How do I amend my 2020 return? for instructions.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
