AMDs supply issues will be difficult to smooth out. They are using TSMC for their CPUs but they also have to compete with nVidia and Apple along with their own GPUs for products and of course any other companies that want to use TSMC for their products.
One route could be to go with multiple FABs, like Apple did with some iPhone CPUs a few years back, but that means there will be a much more pronounced difference between them and people will prefer one over the other.
Otherwise they will have to either hope TSMCs yields go up or they open another FAB to produce more chips. Either way it will take time and being unable to fill orders will hurt a bit.