From nobody Fri Dec 19 15:51:20 2025 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07E0B350A12 for ; Fri, 5 Dec 2025 07:31:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764919894; cv=none; b=tJ3LIdGSoSa8t9B2Xa3Yu9VPpYmjBiu/nVaskfxOQE4/SpsolWVmeaoGLs+olIVsOSnPdjQ7Ggpf36rlLD4EYWw/hdG6SLN7jo9CH/+D4+3o/NkJB3vgJzdERj4QVq7RNGNI9nVhUfEvhPWeRpMUacXJgthzAxKnBxlj7YQ+1m0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764919894; c=relaxed/simple; bh=q90SMt0YTFR33SUZUZn2wV5JNYEUJi9YF3GyGHxmdkU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=hFGKpNthn2cXFxZ/ZvS3WCHFsyENgn3ZKQg22YDsPkrvBBVFDPq4LRuxQm2Wahdfud2nTsKi7PGW3+g+xcRuv6ZaWmp3RRAvQR3501UsV/r3AMXN3EZH3dd2uXI/YIVFvOAdYDKOqYD9TAodX0I/8yJmNQX7v5vpeIg1Vg1keSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 5b2c58e6d1ac11f0a38c85956e01ac42-20251205 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.6,REQID:c49a27f6-661c-4317-a775-fa33b1c4c367,IP:0,UR L:0,TC:0,Content:34,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:34 X-CID-META: VersionHash:a9d874c,CLOUDID:ecd4d238eb2ef9ab7702e5f362e2a12b,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:102|123|850|898,TC:nil,Content:4|15|50,E DM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA :0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 5b2c58e6d1ac11f0a38c85956e01ac42-20251205 X-User: yaolu@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 127752674; Fri, 05 Dec 2025 15:31:04 +0800 From: yaolu@kylinos.cn To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Yao Subject: [PATCH] drm/atomic: determine the hotspots attribute first for drm plane Date: Fri, 5 Dec 2025 15:30:54 +0800 Message-Id: <20251205073054.137965-1-yaolu@kylinos.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lu Yao 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 --- 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_pla= ne *plane, return ret; } else if (property =3D=3D plane->scaling_filter_property) { state->scaling_filter =3D val; - } else if (plane->funcs->atomic_set_property) { - return plane->funcs->atomic_set_property(plane, state, - property, val); } else if (property =3D=3D plane->hotspot_x_property) { if (plane->type !=3D DRM_PLANE_TYPE_CURSOR) { drm_dbg_atomic(plane->dev, @@ -569,6 +566,9 @@ static int drm_atomic_plane_set_property(struct drm_pla= ne *plane, return -EINVAL; } state->hotspot_y =3D 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 =3D=3D plane->scaling_filter_property) { *val =3D state->scaling_filter; - } else if (plane->funcs->atomic_get_property) { - return plane->funcs->atomic_get_property(plane, state, property, val); } else if (property =3D=3D plane->hotspot_x_property) { *val =3D state->hotspot_x; } else if (property =3D=3D plane->hotspot_y_property) { *val =3D 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", --=20 2.25.1