Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr drm fixes domd #27

Merged
merged 2 commits into from
Dec 19, 2017
Merged

Pr drm fixes domd #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a4711
drm/xen-front: Fix mmap operation
Dec 19, 2017
0ec93d5
drm/xen-front: Use XenBus API to close frontend
Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/gpu/drm/xen/xen_drm_front.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/xen/xen_drm_front_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down