diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
index b2e31570932696..3fc29d9f572aaf 100644
--- a/drivers/gpu/drm/xen/xen_drm_front.c
+++ b/drivers/gpu/drm/xen/xen_drm_front.c
@@ -591,7 +591,7 @@ static int xen_drv_remove(struct xenbus_device *dev)
 	mutex_lock(&front_info->mutex);
 	remove_internal(front_info);
 	mutex_unlock(&front_info->mutex);
-	xenbus_switch_state(dev, XenbusStateClosed);
+	xenbus_frontend_closed(dev);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/xen/xen_drm_front_drv.c b/drivers/gpu/drm/xen/xen_drm_front_drv.c
index fcd1c93a78da9e..2b949fb37be749 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_drv.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_drv.c
@@ -155,10 +155,10 @@ static void lastclose(struct drm_device *dev)
 
 static int gem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
-	struct drm_gem_object *obj = vma->vm_private_data;
-	struct xen_drm_front_drm_info *drm_info;
+	struct drm_file *file_priv = filp->private_data;
+	struct drm_device *dev = file_priv->minor->dev;
+	struct xen_drm_front_drm_info *drm_info = dev->dev_private;
 
-	drm_info = obj->dev->dev_private;
 	return drm_info->gem_ops->mmap(filp, vma);
 }