Rev 5354 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 5354 | Rev 5367 | ||
---|---|---|---|
Line 183... | Line 183... | ||
183 | int size, ret; |
183 | int size, ret; |
184 | bool prealloc = false; |
184 | bool prealloc = false; |
Line 185... | Line 185... | ||
185 | 185 | ||
Line -... | Line 186... | ||
- | 186 | mutex_lock(&dev->struct_mutex); |
|
186 | mutex_lock(&dev->struct_mutex); |
187 | |
187 | 188 | #if 0 |
|
188 | if (intel_fb && |
189 | if (intel_fb && |
189 | (sizes->fb_width > intel_fb->base.width || |
190 | (sizes->fb_width > intel_fb->base.width || |
190 | sizes->fb_height > intel_fb->base.height)) { |
191 | sizes->fb_height > intel_fb->base.height)) { |
191 | DRM_DEBUG_KMS("BIOS fb too small (%dx%d), we require (%dx%d)," |
192 | DRM_DEBUG_KMS("BIOS fb too small (%dx%d), we require (%dx%d)," |
192 | " releasing it\n", |
193 | " releasing it\n", |
193 | intel_fb->base.width, intel_fb->base.height, |
194 | intel_fb->base.width, intel_fb->base.height, |
194 | sizes->fb_width, sizes->fb_height); |
195 | sizes->fb_width, sizes->fb_height); |
195 | drm_framebuffer_unreference(&intel_fb->base); |
196 | drm_framebuffer_unreference(&intel_fb->base); |
- | 197 | intel_fb = ifbdev->fb = NULL; |
|
- | 198 | } |
|
196 | intel_fb = ifbdev->fb = NULL; |
199 | #endif |
197 | } |
200 | |
198 | if (!intel_fb || WARN_ON(!intel_fb->obj)) { |
201 | if (!intel_fb || WARN_ON(!intel_fb->obj)) { |
199 | DRM_DEBUG_KMS("no BIOS fb, allocating a new one\n"); |
202 | DRM_DEBUG_KMS("no BIOS fb, allocating a new one\n"); |
200 | ret = intelfb_alloc(helper, sizes); |
203 | ret = intelfb_alloc(helper, sizes); |