diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-02-03 09:51:03 -0800 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-02-23 12:55:11 -0800 |
| commit | a48d5fbb80e30e1c8866f0f470d54cbb50a99b11 (patch) | |
| tree | 15fae761d733f9432657b218172b59ea6b42a0bd /vmwgfx_fb.c | |
| parent | 22286ca091d7fbb08547e3b598cd56997636918b (diff) | |
vmwgfx: Skipping fbdev fb pinning for ldu
Pinning fbdev's FB at the start of VRAM prevents X from pinning
its FB. Since for ldu, the fb would be pinned anyway during a
mode set, just skip pinning it in fbdev.
This is not the best solution, but since ldu is not used much
anymore, it seems like a reasonable workaround.
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'vmwgfx_fb.c')
| -rw-r--r-- | vmwgfx_fb.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/vmwgfx_fb.c b/vmwgfx_fb.c index 57291c9..43ee1ab 100644 --- a/vmwgfx_fb.c +++ b/vmwgfx_fb.c @@ -476,13 +476,15 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par, } if (par->vmw_bo && detach_bo) { + struct vmw_private *vmw_priv = par->vmw_priv; + if (par->bo_ptr) { ttm_bo_kunmap(&par->map); par->bo_ptr = NULL; } if (unref_bo) vmw_dmabuf_unreference(&par->vmw_bo); - else + else if (vmw_priv->active_display_unit != vmw_du_legacy) vmw_dmabuf_unpin(par->vmw_priv, par->vmw_bo, false); } @@ -613,18 +615,25 @@ static int vmw_fb_set_par(struct fb_info *info) /* * Pin before mapping. Since we don't know in what placement - * to pin, call into KMS to do it for us. + * to pin, call into KMS to do it for us. LDU doesn't require + * additional pinning because set_config() would've pinned + * it already */ - ret = vfb->pin(vfb); - if (ret) { - DRM_ERROR("Could not pin the fbdev framebuffer.\n"); - goto out_unlock; + if (vmw_priv->active_display_unit != vmw_du_legacy) { + ret = vfb->pin(vfb); + if (ret) { + DRM_ERROR("Could not pin the fbdev " + "framebuffer.\n"); + goto out_unlock; + } } ret = ttm_bo_kmap(&par->vmw_bo->base, 0, par->vmw_bo->base.num_pages, &par->map); if (ret) { - vfb->unpin(vfb); + if (vmw_priv->active_display_unit != vmw_du_legacy) + vfb->unpin(vfb); + DRM_ERROR("Could not map the fbdev framebuffer.\n"); goto out_unlock; } |