[PATCH] drm/atomic: determine the hotspots attribute first for drm plane

[yaolu]

From: Lu Yao <ya...@kylinos.cn>

For drm driver which has 'DRIVER_CURSOR_HOTSPOT' feature and register
the 'atomic_set/get_property' function in drm_plane_funcs, will causing
hotspots property set/get error.

Fixes: 8f7179a1027d ("drm/atomic: Add support for mouse hotspots")
Signed-off-by: Lu Yao <ya...@kylinos.cn>
---
 drivers/gpu/drm/drm_atomic_uapi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c 
b/drivers/gpu/drm/drm_atomic_uapi.c
index 85dbdaa4a2e2..bf2cb0a2abb1 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -550,9 +550,6 @@ static int drm_atomic_plane_set_property(struct drm_plane 
*plane,
                return ret;
        } else if (property == plane->scaling_filter_property) {
                state->scaling_filter = val;
-       } 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,
@@ -569,6 +566,9 @@ static int drm_atomic_plane_set_property(struct drm_plane 
*plane,
                        return -EINVAL;
                }
                state->hotspot_y = val;
+       } else if (plane->funcs->atomic_set_property) {
+               return plane->funcs->atomic_set_property(plane, state,
+                               property, val);
        } else {
                drm_dbg_atomic(plane->dev,
                               "[PLANE:%d:%s] unknown property [PROP:%d:%s]\n",
@@ -627,12 +627,12 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
                        state->fb_damage_clips->base.id : 0;
        } else if (property == plane->scaling_filter_property) {
                *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 if (plane->funcs->atomic_get_property) {
+               return plane->funcs->atomic_get_property(plane, state, 
property, val);
        } else {
                drm_dbg_atomic(dev,
                               "[PLANE:%d:%s] unknown property [PROP:%d:%s]\n",
-- 
2.25.1