mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 23:03:57 -04:00
drm/virtio: use drmm_mode_config_init
Use managed init call to simplify cleanup. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/20200908070723.6394-2-kraxel@redhat.com
This commit is contained in:
@@ -325,11 +325,14 @@ static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = {
|
||||
.atomic_commit = drm_atomic_helper_commit,
|
||||
};
|
||||
|
||||
void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
|
||||
int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
|
||||
{
|
||||
int i;
|
||||
int i, ret;
|
||||
|
||||
ret = drmm_mode_config_init(vgdev->ddev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
drm_mode_config_init(vgdev->ddev);
|
||||
vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true;
|
||||
vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
|
||||
|
||||
@@ -343,6 +346,7 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
|
||||
vgdev_output_init(vgdev, i);
|
||||
|
||||
drm_mode_config_reset(vgdev->ddev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
|
||||
@@ -351,5 +355,4 @@ void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
|
||||
|
||||
for (i = 0 ; i < vgdev->num_scanouts; ++i)
|
||||
kfree(vgdev->outputs[i].edid);
|
||||
drm_mode_config_cleanup(vgdev->ddev);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user