mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
drm/plane: drop num_overlay_planes (v3)
In order to implement plane leasing we need to count things, just make the code consistent with the counting code currently used for counting crtcs/encoders/connectors and drop the need for num_overlay_planes. v2: don't forget to assign plane_ptr. (keithp) v3: use correct bounds check, found by igt. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
f8d4710458
commit
40d86701a6
3 changed files with 15 additions and 43 deletions
|
@ -385,7 +385,6 @@ void drm_mode_config_init(struct drm_device *dev)
|
||||||
dev->mode_config.num_connector = 0;
|
dev->mode_config.num_connector = 0;
|
||||||
dev->mode_config.num_crtc = 0;
|
dev->mode_config.num_crtc = 0;
|
||||||
dev->mode_config.num_encoder = 0;
|
dev->mode_config.num_encoder = 0;
|
||||||
dev->mode_config.num_overlay_plane = 0;
|
|
||||||
dev->mode_config.num_total_plane = 0;
|
dev->mode_config.num_total_plane = 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_mode_config_init);
|
EXPORT_SYMBOL(drm_mode_config_init);
|
||||||
|
|
|
@ -241,8 +241,6 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
|
||||||
|
|
||||||
list_add_tail(&plane->head, &config->plane_list);
|
list_add_tail(&plane->head, &config->plane_list);
|
||||||
plane->index = config->num_total_plane++;
|
plane->index = config->num_total_plane++;
|
||||||
if (plane->type == DRM_PLANE_TYPE_OVERLAY)
|
|
||||||
config->num_overlay_plane++;
|
|
||||||
|
|
||||||
drm_object_attach_property(&plane->base,
|
drm_object_attach_property(&plane->base,
|
||||||
config->plane_type_property,
|
config->plane_type_property,
|
||||||
|
@ -353,8 +351,6 @@ void drm_plane_cleanup(struct drm_plane *plane)
|
||||||
|
|
||||||
list_del(&plane->head);
|
list_del(&plane->head);
|
||||||
dev->mode_config.num_total_plane--;
|
dev->mode_config.num_total_plane--;
|
||||||
if (plane->type == DRM_PLANE_TYPE_OVERLAY)
|
|
||||||
dev->mode_config.num_overlay_plane--;
|
|
||||||
|
|
||||||
WARN_ON(plane->state && !plane->funcs->atomic_destroy_state);
|
WARN_ON(plane->state && !plane->funcs->atomic_destroy_state);
|
||||||
if (plane->state && plane->funcs->atomic_destroy_state)
|
if (plane->state && plane->funcs->atomic_destroy_state)
|
||||||
|
@ -462,28 +458,18 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,
|
||||||
struct drm_mode_config *config;
|
struct drm_mode_config *config;
|
||||||
struct drm_plane *plane;
|
struct drm_plane *plane;
|
||||||
uint32_t __user *plane_ptr;
|
uint32_t __user *plane_ptr;
|
||||||
int copied = 0;
|
int count = 0;
|
||||||
unsigned num_planes;
|
|
||||||
|
|
||||||
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
config = &dev->mode_config;
|
config = &dev->mode_config;
|
||||||
|
plane_ptr = u64_to_user_ptr(plane_resp->plane_id_ptr);
|
||||||
if (file_priv->universal_planes)
|
|
||||||
num_planes = config->num_total_plane;
|
|
||||||
else
|
|
||||||
num_planes = config->num_overlay_plane;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This ioctl is called twice, once to determine how much space is
|
* This ioctl is called twice, once to determine how much space is
|
||||||
* needed, and the 2nd time to fill it.
|
* needed, and the 2nd time to fill it.
|
||||||
*/
|
*/
|
||||||
if (num_planes &&
|
|
||||||
(plane_resp->count_planes >= num_planes)) {
|
|
||||||
plane_ptr = (uint32_t __user *)(unsigned long)plane_resp->plane_id_ptr;
|
|
||||||
|
|
||||||
/* Plane lists are invariant, no locking needed. */
|
|
||||||
drm_for_each_plane(plane, dev) {
|
drm_for_each_plane(plane, dev) {
|
||||||
/*
|
/*
|
||||||
* Unless userspace set the 'universal planes'
|
* Unless userspace set the 'universal planes'
|
||||||
|
@ -493,12 +479,12 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,
|
||||||
!file_priv->universal_planes)
|
!file_priv->universal_planes)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (put_user(plane->base.id, plane_ptr + copied))
|
if (count < plane_resp->count_planes &&
|
||||||
|
put_user(plane->base.id, plane_ptr + count))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
copied++;
|
count++;
|
||||||
}
|
}
|
||||||
}
|
plane_resp->count_planes = count;
|
||||||
plane_resp->count_planes = num_planes;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -429,19 +429,6 @@ struct drm_mode_config {
|
||||||
*/
|
*/
|
||||||
struct list_head encoder_list;
|
struct list_head encoder_list;
|
||||||
|
|
||||||
/**
|
|
||||||
* @num_overlay_plane:
|
|
||||||
*
|
|
||||||
* Number of overlay planes on this device, excluding primary and cursor
|
|
||||||
* planes.
|
|
||||||
*
|
|
||||||
* Track number of overlay planes separately from number of total
|
|
||||||
* planes. By default we only advertise overlay planes to userspace; if
|
|
||||||
* userspace sets the "universal plane" capability bit, we'll go ahead
|
|
||||||
* and expose all planes. This is invariant over the lifetime of a
|
|
||||||
* device and hence doesn't need any locks.
|
|
||||||
*/
|
|
||||||
int num_overlay_plane;
|
|
||||||
/**
|
/**
|
||||||
* @num_total_plane:
|
* @num_total_plane:
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue