diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-09-23 16:52:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-23 16:52:06 +1000 |
| commit | 840c9a305481ed59820bbd87fbcf78dd242d5702 (patch) | |
| tree | a8184247c42e47e9e504fc0b8988c38260917489 /linux-core/intel_fb.c | |
| parent | 0130aa0de940a49c086a0fb080e524d55b55ec8b (diff) | |
Update intel modesetting to use mm_private instead of mm_handle.
Diffstat (limited to 'linux-core/intel_fb.c')
| -rw-r--r-- | linux-core/intel_fb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c index c1391c0a..3d786ea3 100644 --- a/linux-core/intel_fb.c +++ b/linux-core/intel_fb.c @@ -728,7 +728,7 @@ int intelfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_height i915_gem_clflush_object(fbo); - fb = intel_user_framebuffer_create(dev, NULL, &mode_cmd); + fb = intel_framebuffer_create(dev, &mode_cmd, fbo); if (!fb) { DRM_ERROR("failed to allocate fb.\n"); ret = -ENOMEM; @@ -740,8 +740,6 @@ int intelfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_height intel_fb = to_intel_framebuffer(fb); *intel_fb_p = intel_fb; - intel_fb->obj = fbo; - info = framebuffer_alloc(sizeof(struct intelfb_par), device); if (!info) { ret = -ENOMEM; @@ -1137,7 +1135,7 @@ int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb) unregister_framebuffer(info); iounmap(info->screen_base); mutex_lock(&dev->struct_mutex); - drm_gem_object_unreference(intel_fb->obj); + drm_gem_object_unreference(intel_fb->base.mm_private); mutex_unlock(&dev->struct_mutex); framebuffer_release(info); } |