diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
| commit | 9adf8c02563b1e6110e46dabd733e2dc440b4200 (patch) | |
| tree | 7a0e360dc9663b3e269a5d5e164672bf8885a5e4 /linux-core/intel_fb.c | |
| parent | d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 (diff) | |
| parent | b9d9c30474238ac8ba4899a19fe4a97e9376f6c4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/drm_objects.h
Diffstat (limited to 'linux-core/intel_fb.c')
| -rw-r--r-- | linux-core/intel_fb.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c index c9cb293a..564a913e 100644 --- a/linux-core/intel_fb.c +++ b/linux-core/intel_fb.c @@ -500,8 +500,9 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc) DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_MEM_TT | - DRM_BO_FLAG_MEM_VRAM, - 0, 0, 0, + DRM_BO_FLAG_MEM_VRAM | + DRM_BO_FLAG_NO_EVICT, + DRM_BO_HINT_DONT_FENCE, 0, 0, &fbo); if (ret || !fbo) { printk(KERN_ERR "failed to allocate framebuffer\n"); @@ -510,14 +511,6 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc) return -EINVAL; } - ret = drm_bo_set_pin(dev, fbo, 1); - if (ret) { - printk(KERN_ERR "failed to pin framebuffer, aborting\n"); - drm_framebuffer_destroy(fb); - framebuffer_release(info); - return -EINVAL; - } - fb->offset = fbo->offset; fb->bo = fbo; printk("allocated %dx%d fb: 0x%08lx, bo %p\n", fb->width, |