git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-04-18 06:33:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: remove early fb allocation dependency on CONFIG_FB v2

Browse Source 
By stuffing the fb allocation into the crtc, we get mode set lifetime
refcounting for free, but have to handle the initial pin & fence
slightly differently.  It also means we can move the shared fb handling
into the core rather than leaving it out in the fbdev code.

v2: null out crtc->fb on error (Daniel)
    take fbdev fb ref and remove unused error path (Daniel)

Requested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jesse Barnes
2014-03-07 08:57:55 -08:00
committed by Daniel Vetter
parent d978ef1445
commit 484b41dd70
3 changed files with 105 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/i915/intel_fbdev.c
View File

@@ -481,7 +481,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
intel_crtc = to_intel_crtc(crtc);
if (!intel_crtc->active || !intel_crtc->plane_config.fb) {
if (!intel_crtc->active || !crtc->fb) {
DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
pipe_name(intel_crtc->pipe));
continue;
@@ -491,7 +491,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
DRM_DEBUG_KMS("found possible fb from plane %c\n",
pipe_name(intel_crtc->pipe));
plane_config = &intel_crtc->plane_config;
fb = plane_config->fb;
fb = to_intel_framebuffer(crtc->fb);
max_size = plane_config->size;
}
}
@@ -543,43 +543,15 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
max_size, cur_size);
}
/* Free unused fbs */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
struct intel_framebuffer *cur_fb;
intel_crtc = to_intel_crtc(crtc);
cur_fb = intel_crtc->plane_config.fb;
if (cur_fb && cur_fb != fb)
drm_framebuffer_unreference(&cur_fb->base);
}
if (!fb) {
DRM_DEBUG_KMS("BIOS fb not suitable for all pipes, not using\n");
goto out;
}
ifbdev->preferred_bpp = plane_config->fb->base.bits_per_pixel;
ifbdev->preferred_bpp = fb->base.bits_per_pixel;
ifbdev->fb = fb;
/* Assuming a single fb across all pipes here */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
intel_crtc = to_intel_crtc(crtc);
if (!intel_crtc->active)
continue;
/*
* This should only fail on the first one so we don't need
* to cleanup any secondary crtc->fbs
*/
if (intel_pin_and_fence_fb_obj(dev, fb->obj, NULL))
goto out_unref_obj;
crtc->fb = &fb->base;
drm_gem_object_reference(&fb->obj->base);
drm_framebuffer_reference(&fb->base);
}
drm_framebuffer_reference(&ifbdev->fb->base);
/* Final pass to check if any active pipes don't have fbs */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -597,8 +569,6 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
DRM_DEBUG_KMS("using BIOS fb for initial console\n");
return true;
out_unref_obj:
drm_framebuffer_unreference(&fb->base);
out:
return false;