From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: Chris Wilson <chris@chris-wilson.co.uk>, "Goel, Akash" <akash.goel@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Jesse Barnes <jbarnes@virtuousgeek.org>, stable@vger.kernel.org Subject: [PATCH v3] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping Date: Fri, 20 Nov 2015 14:34:34 +0000 [thread overview] Message-ID: <1448030074-10857-1-git-send-email-chris@chris-wilson.co.uk> (raw) In-Reply-To: <1448029000-10616-2-git-send-email-chris@chris-wilson.co.uk> A long time ago (before 3.14) we relied on a permanent pinning of the ifbdev to lock the fb in place inside the GGTT. However, the introduction of stealing the BIOS framebuffer and reusing its address in the GGTT for the fbdev has muddied waters and we use an inherited fb. However, the inherited fb is only pinned whilst it is active and we no longer have an explicit pin for the info->system_base mmapping used by the fbdev. The result is that after some aperture pressure the fbdev may be evicted, but we continue to write the fbcon into the same GGTT address - overwriting anything else that may be put into that offset. The effect is most pronounced across suspend/resume as intel_fbdev_set_suspend() does a full clear over the whole scanout. v2: Only unpin the intel_fb is we allocate it. If we inherit the fb from the BIOS, we do not own the pinned vma (except for the reference we add in this patch for our access via info->screen_base). v3: Finish balancing the vma pinning for the normal !preallocated case. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: "Goel, Akash" <akash.goel@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_fbdev.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 7ccde58f8c98..7a415fe31299 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -225,6 +225,16 @@ static int intelfb_create(struct drm_fb_helper *helper, mutex_lock(&dev->struct_mutex); + /* The fb constructor will have already pinned us (or inherited a + * GGTT region from the BIOS) suitable for a scanout, so + * this should just be a no-op and increment the pin count for the + * fbdev mmapping. It does have a useful side-effect of validating + * the pin for fbdev's use via a GGTT mmapping. + */ + ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE); + if (ret) + goto out_unlock; + info = drm_fb_helper_alloc_fbi(helper); if (IS_ERR(info)) { DRM_ERROR("Failed to allocate fb_info\n"); @@ -279,6 +289,12 @@ static int intelfb_create(struct drm_fb_helper *helper, fb->width, fb->height, i915_gem_obj_ggtt_offset(obj), obj); + /* We pin the vma for our access through info->screen_base, so + * we can drop the pin we took if we created the intel_fb. + */ + if (!prealloc) + i915_gem_object_ggtt_unpin(obj); + mutex_unlock(&dev->struct_mutex); vga_switcheroo_client_fb_set(dev->pdev, info); return 0; @@ -286,7 +302,12 @@ static int intelfb_create(struct drm_fb_helper *helper, out_destroy_fbi: drm_fb_helper_release_fbi(helper); out_unpin: + /* Once for info->screen_base mmaping... */ i915_gem_object_ggtt_unpin(obj); +out_unlock: + if (!prealloc) + /* ...and once for the intel_fb */ + i915_gem_object_ggtt_unpin(obj); mutex_unlock(&dev->struct_mutex); return ret; } @@ -524,6 +545,8 @@ static const struct drm_fb_helper_funcs intel_fb_helper_funcs = { static void intel_fbdev_destroy(struct drm_device *dev, struct intel_fbdev *ifbdev) { + /* Release the pinning for the info->screen_base mmaping. */ + i915_gem_object_ggtt_unpin(ifbdev->fb->obj); drm_fb_helper_unregister_fbi(&ifbdev->helper); drm_fb_helper_release_fbi(&ifbdev->helper); -- 2.6.2
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, "Goel, Akash" <akash.goel@intel.com>, stable@vger.kernel.org Subject: [PATCH v3] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping Date: Fri, 20 Nov 2015 14:34:34 +0000 [thread overview] Message-ID: <1448030074-10857-1-git-send-email-chris@chris-wilson.co.uk> (raw) In-Reply-To: <1448029000-10616-2-git-send-email-chris@chris-wilson.co.uk> A long time ago (before 3.14) we relied on a permanent pinning of the ifbdev to lock the fb in place inside the GGTT. However, the introduction of stealing the BIOS framebuffer and reusing its address in the GGTT for the fbdev has muddied waters and we use an inherited fb. However, the inherited fb is only pinned whilst it is active and we no longer have an explicit pin for the info->system_base mmapping used by the fbdev. The result is that after some aperture pressure the fbdev may be evicted, but we continue to write the fbcon into the same GGTT address - overwriting anything else that may be put into that offset. The effect is most pronounced across suspend/resume as intel_fbdev_set_suspend() does a full clear over the whole scanout. v2: Only unpin the intel_fb is we allocate it. If we inherit the fb from the BIOS, we do not own the pinned vma (except for the reference we add in this patch for our access via info->screen_base). v3: Finish balancing the vma pinning for the normal !preallocated case. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: "Goel, Akash" <akash.goel@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_fbdev.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 7ccde58f8c98..7a415fe31299 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -225,6 +225,16 @@ static int intelfb_create(struct drm_fb_helper *helper, mutex_lock(&dev->struct_mutex); + /* The fb constructor will have already pinned us (or inherited a + * GGTT region from the BIOS) suitable for a scanout, so + * this should just be a no-op and increment the pin count for the + * fbdev mmapping. It does have a useful side-effect of validating + * the pin for fbdev's use via a GGTT mmapping. + */ + ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE); + if (ret) + goto out_unlock; + info = drm_fb_helper_alloc_fbi(helper); if (IS_ERR(info)) { DRM_ERROR("Failed to allocate fb_info\n"); @@ -279,6 +289,12 @@ static int intelfb_create(struct drm_fb_helper *helper, fb->width, fb->height, i915_gem_obj_ggtt_offset(obj), obj); + /* We pin the vma for our access through info->screen_base, so + * we can drop the pin we took if we created the intel_fb. + */ + if (!prealloc) + i915_gem_object_ggtt_unpin(obj); + mutex_unlock(&dev->struct_mutex); vga_switcheroo_client_fb_set(dev->pdev, info); return 0; @@ -286,7 +302,12 @@ static int intelfb_create(struct drm_fb_helper *helper, out_destroy_fbi: drm_fb_helper_release_fbi(helper); out_unpin: + /* Once for info->screen_base mmaping... */ i915_gem_object_ggtt_unpin(obj); +out_unlock: + if (!prealloc) + /* ...and once for the intel_fb */ + i915_gem_object_ggtt_unpin(obj); mutex_unlock(&dev->struct_mutex); return ret; } @@ -524,6 +545,8 @@ static const struct drm_fb_helper_funcs intel_fb_helper_funcs = { static void intel_fbdev_destroy(struct drm_device *dev, struct intel_fbdev *ifbdev) { + /* Release the pinning for the info->screen_base mmaping. */ + i915_gem_object_ggtt_unpin(ifbdev->fb->obj); drm_fb_helper_unregister_fbi(&ifbdev->helper); drm_fb_helper_release_fbi(&ifbdev->helper); -- 2.6.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-11-20 14:34 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-20 14:16 [PATCH v2 1/2] drm/i915: Set the map-and-fenceable flag for preallocated objects Chris Wilson 2015-11-20 14:16 ` [PATCH v2 2/2] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping Chris Wilson 2015-11-20 14:34 ` Chris Wilson [this message] 2015-11-20 14:34 ` [PATCH v3] " Chris Wilson 2015-11-20 16:15 ` Jesse Barnes 2015-11-20 16:29 ` [PATCH v4] " Chris Wilson 2015-11-20 16:35 ` Jesse Barnes 2015-11-20 16:35 ` Jesse Barnes 2015-11-20 16:46 ` [Intel-gfx] " kbuild test robot 2015-11-20 18:01 ` kbuild test robot 2015-11-24 16:46 ` Daniel Vetter 2015-12-01 9:01 ` Jani Nikula 2015-12-01 9:01 ` Jani Nikula 2015-11-24 21:20 ` Lukas Wunner 2015-12-04 16:05 ` [PATCH v5] " Chris Wilson 2015-12-06 20:33 ` Lukas Wunner 2015-12-16 10:52 ` Daniel Vetter 2015-12-17 11:34 ` [Intel-gfx] " Ville Syrjälä 2015-12-17 11:34 ` Ville Syrjälä 2015-12-10 16:36 ` [Intel-gfx] " Ville Syrjälä 2015-12-10 16:36 ` Ville Syrjälä 2015-12-10 16:41 ` [Intel-gfx] " Takashi Iwai 2015-12-10 16:41 ` Takashi Iwai 2015-12-17 15:59 ` [Intel-gfx] " Daniel Vetter 2015-12-17 15:59 ` Daniel Vetter 2015-12-23 11:07 ` Jani Nikula 2015-11-20 16:06 ` [PATCH v2 1/2] drm/i915: Set the map-and-fenceable flag for preallocated objects Jesse Barnes
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1448030074-10857-1-git-send-email-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --cc=akash.goel@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jbarnes@virtuousgeek.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.