From patchwork Fri Oct 5 08:11:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10627557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58E3E15A6 for ; Fri, 5 Oct 2018 08:12:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FD4529265 for ; Fri, 5 Oct 2018 08:12:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 446172926E; Fri, 5 Oct 2018 08:12:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E17C629265 for ; Fri, 5 Oct 2018 08:12:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47EF56E762; Fri, 5 Oct 2018 08:12:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02A326E75C for ; Fri, 5 Oct 2018 08:12:24 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id g26-v6so10899888edp.0 for ; Fri, 05 Oct 2018 01:12:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HuCsYK/3yXsOaV3A8gzCsBWL8MSDJhgbqO0HsQSiYkY=; b=NeFVpVleADsSdPBenOJ6tfd4q0T66IRmK+POkPC8LqhNYd7tV5zgQUYPs+V2Zd8sUF Pds7tf4vrmsMrwjEoKHB03guwWQPxHDivl3qrV0lrrYZmvH1YH8mDpWyI8idaByp1vqY 6pKQBAUu/WeJ6z+Iu59jLfFVdg6edS7QXgETX+z+nby6odZlKzntXv5FJF4FVYtljfSi AguiP3PKS/bnrWzL0ephau5cmNGWW3H1H3L+JqIOHNTw9QbhV2Mn8nGD0qElk4qtuvJc C7ArUMUJV/ZL4/FDtFOck2j1NvLnLFs5KRv2i52TXW+aqh45amaYixS+d7gK11mDFM2K CHuA== X-Gm-Message-State: ABuFfoi3wLREIFOFhH/jnJ/vjUmo/iM+5S3D/qg4cajdoB3xHTD+l9J8 rzGu5+KiiIcFUQBvjL/CtgpsfKl3zYk= X-Google-Smtp-Source: ACcGV60lF7WM5tJpXm2OE+SVMk/9ueBsJYvgnamvkRhOT9d8KjF6eNsRZjnQc56TPHLNLwgDSeg5rA== X-Received: by 2002:a50:87ba:: with SMTP id a55-v6mr13094530eda.140.1538727142235; Fri, 05 Oct 2018 01:12:22 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id b12-v6sm1260087eje.36.2018.10.05.01.12.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:12:21 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 5 Oct 2018 10:11:46 +0200 Message-Id: <20181005081152.29482-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20181005081152.29482-1-daniel.vetter@ffwll.ch> References: <20181005081152.29482-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [FOR CI 16/22] drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Hellstrom Use the correct helper and also return early on helper success rather than on helper failure. Also explicitly return 0 in the case of no fb. v2: Check for !fb after updating state->visible (Ville). Reviewed-by: Ville Syrjälä Signed-off-by: Thomas Hellstrom (v1) Reported-by: Dan Carpenter Reported-by: Daniel Vetter Cc: Ville Syrjälä Signed-off-by: Daniel Vetter Cc: VMware Graphics Cc: Sinclair Yeh Cc: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index a50fb0360317..e88689b44efc 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -493,24 +493,24 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *new_state) { int ret = 0; + struct drm_crtc_state *crtc_state = NULL; struct vmw_surface *surface = NULL; struct drm_framebuffer *fb = new_state->fb; - struct drm_rect src = drm_plane_state_src(new_state); - struct drm_rect dest = drm_plane_state_dest(new_state); + if (new_state->crtc) + crtc_state = drm_atomic_get_new_crtc_state(new_state->state, + new_state->crtc); - /* Turning off */ - if (!fb) + ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, + DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_HELPER_NO_SCALING, + true, true); + if (ret) return ret; - ret = drm_plane_helper_check_update(plane, new_state->crtc, fb, - &src, &dest, - DRM_MODE_ROTATE_0, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, - true, true, &new_state->visible); - if (!ret) - return ret; + /* Turning off */ + if (!fb) + return 0; /* A lot of the code assumes this */ if (new_state->crtc_w != 64 || new_state->crtc_h != 64) {