diff mbox

[06/13] i830_memory: rename i830_bind_all_memory to reflect code reality

Message ID 6ab3c1a8d7cea47c0a26dadf5b7f742443e28568.1267517278.git.daniel.vetter@ffwll.ch (mailing list archive)
State Deferred, archived
Headers show

Commit Message

Daniel Vetter March 2, 2010, 8:22 a.m. UTC
None
diff mbox

Patch

diff --git a/src/i830.h b/src/i830.h
index 45b6028..8449dc6 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -462,7 +462,7 @@  Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
 int i830_pad_drawable_width(int width, int cpp);
 
 /* i830_memory.c */
-Bool i830_bind_all_memory(ScrnInfoPtr scrn);
+Bool i830_reinit_memory(ScrnInfoPtr scrn);
 unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
 unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
 				   uint32_t tiling_mode);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4b2e617..733f409 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1403,7 +1403,7 @@  static Bool I830EnterVT(int scrnIndex, int flags)
 		}
 	}
 
-	if (!i830_bind_all_memory(scrn))
+	if (!i830_reinit_memory(scrn))
 		return FALSE;
 
 	intel_batch_init(scrn);
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 0d7ae43..2c00d43 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -439,13 +439,10 @@  Bool i830_allocate_2d_memory(ScrnInfoPtr scrn)
 }
 
 /**
- * Called at EnterVT to grab the AGP GART and bind our allocations.
- *
- * In zaphod mode, this will walk the list trying to bind twice, since each
- * intel points to the same allocation list, but the bind_memory will just
- * no-op then.
+ * Called at EnterVT to reinit memory related stuff. Also reinits the drmmode
+ * cursors.
  */
-Bool i830_bind_all_memory(ScrnInfoPtr scrn)
+Bool i830_reinit_memory(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);