Somewhat disappointing performance... If you already know the answer, you can do this:
Simplify[s (q - 1)]/(q - 1)
Another way:
Sum[q^k, {k, 0, n}] /. n -> 20
