I think it depends on your

I think it depends on your goals and configuration. Ideally, you would have a separate calibration for each input. In practice, this may not be ideal because you might be using an AVR to switch inputs or the display don’t have input modes to handle them that are adequate (or even there). What I mean by that is it might be possible to have a “Movie” mode for one source and “Night” mode for another (or whatever your displayis capable of). This would only be possible if your display had multiple viewing modes that were acceptable.

If we assume one single mode and switching by AVR, then you may want to do as you suggest. It probably results in the least amount of comprimise. It is probably difficult/impossible though to achieve the same exact response on the display to both sources especially if using RGB on the PC output coupled with YCbCr on the CE equipment due to the conversions required. You might be best off trying to maintain the same colorspace output across all sources (e.g. YCbCr).