---

yaml --- r: 201246 b: refs/heads/master c: 127bd2a h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · 38a7eee · 38a7eee
1 parent 2d3716b
commit 38a7eee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9934c132989d5c488d2e15188220ce240960ce96
+refs/heads/master: 127bd2ac91c3ecf42890ac320f4c65346d110e78
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1255,7 +1255,7 @@ static void intel_update_fbc(struct drm_crtc *crtc,
 	}
 }
 
-static int
+int
 intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
 {
 	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -215,6 +215,9 @@ extern void intel_init_clock_gating(struct drm_device *dev);
 extern void ironlake_enable_drps(struct drm_device *dev);
 extern void ironlake_disable_drps(struct drm_device *dev);
 
+extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,
+				      struct drm_gem_object *obj);
+
 extern int intel_framebuffer_init(struct drm_device *dev,
 				  struct intel_framebuffer *ifb,
 				  struct drm_mode_fb_cmd *mode_cmd,

diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c
@@ -98,7 +98,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
 	mutex_lock(&dev->struct_mutex);
 
-	ret = i915_gem_object_pin(fbo, 64*1024);
+	ret = intel_pin_and_fence_fb_obj(dev, fbo);
 	if (ret) {
 		DRM_ERROR("failed to pin fb: %d\n", ret);
 		goto out_unref;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1255,7 +1255,7 @@ static void intel_update_fbc(struct drm_crtc *crtc, @@
     	}
     }
-    static int
+    int
     intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
     {
     	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
@@ Expand Down @@