diff --git a/dim b/dim
index 68ab3e9d9fbbd808747fab3dc5e03794cf50315f..f27642c774162975e79080c73044a5615e4d751f 100755
--- a/dim
+++ b/dim
@@ -299,7 +299,7 @@ function url_to_remote # url [url ...]
 		remote="$repo"
 	fi
 
-	echoerr "Adding remote for ${repo} repo from URLs: $*"
+	echoerr "Adding remote for ${repo} repo from URLs: $url_list"
 
 	if [ $ASK_USER_ASSUME_YES -ne 1 ]; then
 		read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " remote
@@ -2439,19 +2439,19 @@ function dim_status
 	done
 }
 
-function setup_aux_checkout # name url directory
+function bootstrap_drm_rerere
 {
-	local name url dir remote
+	local name dir remote url_list
 
-	name=$1
-	url=$2
-	dir=$3
+	url_list="ssh://git@gitlab.freedesktop.org/drm/tip.git"
+	name="rerere-cache"
+	dir="drm-rerere"
 
 	echo "Setting up $dir ..."
 
 	if [ ! -d $dir ]; then
 		cd $DIM_PREFIX/$DIM_REPO
-		remote=$(url_to_remote $url)
+		remote=$(url_to_remote $url_list)
 		if ! git_branch_exists $name ; then
 			git_fetch_helper $remote
 			git branch --track $name $remote/$name
@@ -2459,7 +2459,7 @@ function setup_aux_checkout # name url directory
 		git worktree add $DIM_PREFIX/$dir $name
 	else
 		cd $dir
-		remote=$(url_to_remote $url)
+		remote=$(url_to_remote $url_list)
 	fi
 	if ! git_branch_exists $name ; then
 		git checkout -t $remote/$name
@@ -2497,7 +2497,6 @@ function dim_setup # options
 
 	parse_opt_dim_setup "$@"
 
-	drm_tip_ssh=ssh://git@gitlab.freedesktop.org/drm/tip.git
 	linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 
 	if [[ ! -d "$DIM_PREFIX" ]]; then
@@ -2538,16 +2537,16 @@ function dim_setup # options
 		fi
 	fi
 
-	setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere
+	bootstrap_drm_rerere
 
 	# now that drm-rerere is setup, read the config again during fetch the
 	# additional branches from integration manifest will be read
 	echo -n "Reloading $dim_integration_config... "
 	read_integration_config
-	echo "Done."
-
-	setup_aux_checkout drm-tip $drm_tip_ssh drm-tip
+	echo -e "Done.\n"
 
+	echo "Setting up drm-tip ..."
+	dim_create_workdir drm-tip
 	dim_update_branches
 
 	echo "dim setup successfully completed!"