From: Justin M. Forbes
DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series
This is a temporary revert while things are worked out upstream. This
series breaks gnome on virtio-vga, which means it also breaks openqa,
and keeps kernel updates gated out of rawhide.
Signed-off-by: Justin M. Forbes
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
index blahblah..blahblah 100644
--- a/Documentation/gpu/drm-kms.rst
+++ b/Documentation/gpu/drm-kms.rst
@@ -581,12 +581,6 @@ Variable Refresh Properties
.. kernel-doc:: drivers/gpu/drm/drm_connector.c
:doc: Variable refresh properties
-Cursor Hotspot Properties
-
-.. kernel-doc:: drivers/gpu/drm/drm_plane.c
- :doc: hotspot properties
-
Existing KMS Properties
---
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c
b/drivers/gpu/drm/drm_atomic_state_helper.c
index blahblah..blahblah 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -275,20 +275,6 @@ void __drm_atomic_helper_plane_state_reset(struct
drm_plane_state *plane_state,
plane_state->normalized_zpos = val;
}
}
-
- if (plane->hotspot_x_property) {
- if (!drm_object_property_get_default_value(&plane->base,
-
plane->hotspot_x_property,
- &val))
- plane_state->hotspot_x = val;
- }
-
- if (plane->hotspot_y_property) {
- if (!drm_object_property_get_default_value(&plane->base,
-
plane->hotspot_y_property,
- &val))
- plane_state->hotspot_y = val;
- }
}
EXPORT_SYMBOL(__drm_atomic_helper_plane_state_reset);
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
b/drivers/gpu/drm/drm_atomic_uapi.c
index blahblah..blahblah 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -551,22 +551,6 @@ static int drm_atomic_plane_set_property(struct drm_plane
*plane,
} else if (plane->funcs->atomic_set_property) {
return plane->funcs->atomic_set_property(plane, state,
property, val);
- } else if (property == plane->hotspot_x_property) {
- if (plane->type != DRM_PLANE_TYPE_CURSOR) {
- drm_dbg_atomic(plane->dev,
- "[PLANE:%d:%s] is not a cursor plane:
0x%llx\n",
- plane->base.id, plane->name, val);
- return -EINVAL;
- }
- state->hotspot_x = val;
- } else if (property == plane->hotspot_y_property) {
- if (plane->type != DRM_PLANE_TYPE_CURSOR) {
- drm_dbg_atomic(plane->dev,
- "[PLANE:%d:%s] is not a cursor plane:
0x%llx\n",
- plane->base.id, plane->name, val);
- return -EINVAL;
- }
- state->hotspot_y = val;
} else {
drm_dbg_atomic(plane->dev,
"[PLANE:%d:%s] unknown property [PROP:%d:%s]\n",
@@ -627,10 +611,6 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
*val = state->scaling_filter;
} else if (plane->funcs->atomic_get_property) {
return plane->funcs->atomic_get_property(plane, state,
property, val);
- } else if (property == plane->hotspot_x_property) {
- *val = state->hotspot_x;
- } else if (property == plane->hotspot_y_property) {
- *val = state->hotspot_y;
} else {
drm_dbg_atomic(dev,
"[PLANE:%d:%s] unknown property [PROP:%d:%s]\n",
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index blahblah..blahblah 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -364,15 +364,6 @@ drm_setclientcap(struct drm_device *dev, void *data,
struct drm_file *file_priv)
return -EINVAL;
file_priv->writeback_connectors = req->value;
break;
- case DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT:
- if (!drm_core_check_feature(dev, DRIVER_CURSOR_HOTSPOT))
- return -EOPNOTSUPP;
- if (!file_priv->atomic)
- return -EINVAL;
- if (req->value > 1)
- return -EINVAL;
- file_priv->supports_virtualized_cursor_plane = req->value;
- break;
default:
return -EINVAL;
}
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index blahblah..bla
