diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index ac6b0e6..249a65b 100644
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -535,7 +535,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R300_GB_TILE_CONFIG                      0x4018
 #	define R300_GB_TILE_DISABLE             (0 << 0)
 #	define R300_GB_TILE_ENABLE              (1 << 0)
-#	define R300_GB_TILE_PIPE_COUNT_RV300	(0 << 1) /* RV350 (1 pipe, 1 ctx) */
+#	define R300_GB_TILE_PIPE_COUNT_RV350	(0 << 1) /* RV350 (1 pipe, 1 ctx) */
 #	define R300_GB_TILE_PIPE_COUNT_R300	(3 << 1) /* R300 (2 pipes, 1 ctx) */
 #	define R300_GB_TILE_PIPE_COUNT_R420_3P  (6 << 1) /* R420-3P (3 pipes, 1 ctx) */
 #	define R300_GB_TILE_PIPE_COUNT_R420	(7 << 1) /* R420 (4 pipes, 1 ctx) */
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index ec9bf25..f4025f3 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1909,6 +1909,7 @@ static void r300ResetHwState(r300ContextPtr r300)
 	case CHIP_FAMILY_R300:
 	case CHIP_FAMILY_R350:
 	case CHIP_FAMILY_RV410:
+	case CHIP_FAMILY_RS690:
 		r300->hw.gb_misc.cmd[R300_GB_MISC_TILE_CONFIG] |=
 		    R300_GB_TILE_PIPE_COUNT_R300;
 		break;
@@ -1918,7 +1919,7 @@ static void r300ResetHwState(r300ContextPtr r300)
 		break;
 	default:
 		r300->hw.gb_misc.cmd[R300_GB_MISC_TILE_CONFIG] |=
-		    R300_GB_TILE_DISABLE; /* TODO: This disables tiling totally. I guess it happened accidentially. */
+		    R300_GB_TILE_PIPE_COUNT_RV350;
 		break;
 	}