From patchwork Tue Jul 12 03:32:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Rusin X-Patchwork-Id: 12914513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E618EC433EF for ; Tue, 12 Jul 2022 03:33:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC69910F647; Tue, 12 Jul 2022 03:33:16 +0000 (UTC) Received: from letterbox.kde.org (letterbox.kde.org [46.43.1.242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F2CA10F573 for ; Tue, 12 Jul 2022 03:33:05 +0000 (UTC) Received: from vertex.vmware.com (pool-173-49-113-140.phlapa.fios.verizon.net [173.49.113.140]) (Authenticated sender: zack) by letterbox.kde.org (Postfix) with ESMTPSA id ACC9E321F3B; Tue, 12 Jul 2022 04:33:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kde.org; s=users; t=1657596784; bh=8v3+/m9nKknnUh/YmqEA8Iex1ViMM/DfqQFrSlU9Bn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nh682j+A93BoMqyn01/HzUriZIcvEg43nhOjOJ5AQh/0er7o7yOumP6QgT3e9MRux KnCLcXj96DVAxd8AKkppE+a4dEPtQTlN10qN6V7p1G1bXh+Bj6+RtfEMiohDTpuMu8 A93+/quF4L6xPPVWMDG7KNkhi5WRY5i6yMWPcssEeMsO6byg2ypk1+AoCDFylU7mI2 8D8eXtJnAaGNd4oYLKXsD1/RB8BEXPqoK7EtLWa9X+NdJJXhLMFrtLH4eKarQwFNzw iAidJh2q8SAtrdVNorAOP2lTeUBz4oGv8ItV5pGfnTDOVr8xtjf/BmXDmmwWDkF2gM 1i+khgso+lUjA== From: Zack Rusin To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/8] drm/vmwgfx: Use the hotspot properties from cursor planes Date: Mon, 11 Jul 2022 23:32:41 -0400 Message-Id: <20220712033246.1148476-4-zack@kde.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712033246.1148476-1-zack@kde.org> References: <20220712033246.1148476-1-zack@kde.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Zack Rusin Cc: krastevm@vmware.com, ppaalanen@gmail.com, mombasawalam@vmware.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Zack Rusin Atomic modesetting got support for mouse hotspots via the hotspot properties. Port the legacy kms hotspot handling to the new properties on cursor planes. Signed-off-by: Zack Rusin Cc: Martin Krastev Cc: Maaz Mombasawala Reviewed-by: Martin Krastev --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index ff2f735bbe7a..3d3f73109199 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -652,13 +652,8 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, struct vmw_plane_state *vps = vmw_plane_state_to_vps(new_state); s32 hotspot_x, hotspot_y; - hotspot_x = du->hotspot_x; - hotspot_y = du->hotspot_y; - - if (new_state->fb) { - hotspot_x += new_state->fb->hot_x; - hotspot_y += new_state->fb->hot_y; - } + hotspot_x = du->hotspot_x + new_state->hotspot_x; + hotspot_y = du->hotspot_y + new_state->hotspot_y; du->cursor_surface = vps->surf; du->cursor_bo = vps->bo;