From patchwork Wed Oct 3 09:18:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10624505 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 E321C14BD for ; Wed, 3 Oct 2018 09:19:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9EC428724 for ; Wed, 3 Oct 2018 09:19:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE6D628727; Wed, 3 Oct 2018 09:19:03 +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 7E2AC28724 for ; Wed, 3 Oct 2018 09:19:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 547CC6E41D; Wed, 3 Oct 2018 09:18:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CC796E41A for ; Wed, 3 Oct 2018 09:18:38 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id n2-v6so4640139edo.9 for ; Wed, 03 Oct 2018 02:18:38 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D0DaGvav20Z+fOXwMazgI0KzMc8v3WETbsILBsOAI1o=; b=E4t4KTT6+PHf/HXi3MO42rmdNamtWkLoJN1cp0wJ4PklKvImgbJtT+6DnxFGBOrhFs ZfMfzD+3i6Wb0DWaw2Z/rBdxBnATEX8xPwhm/P6TSbkJSITY1MVyAglRJN+rFPKEQD5F EZNxgGDTFcu0wnhFXH4zMIvS5IxqC+EtsKRdbr2S1/ATottwnBoyYg8xVL48CwDdBbAB RRRJCKialo10Y5/rKv8qSisCIIl9uic8Simscjcy/KZP2nwweMcmB078UXRCDhUrxNuh NnupHyCPDrxhnjZtg8GQH096Ck8bWSJW0r4876R5gDAsSsL4ftphOEmpXsG328MwGe16 hZQw== X-Gm-Message-State: ABuFfohKa2svnb0ar7WGQk6gEoe0K8FsS6emHF96xuPXO/XY2V3fmYFD C+ofg3cTv+4boK7J3cLEK2/7BQmnsOM= X-Google-Smtp-Source: ACcGV62tn9sbsYz/DxGZ75nrhBFjFMLaZt/dDw4/RAWPFYpD+tYqjE7m0+NL8rGN0NzJdG13xDu1Qw== X-Received: by 2002:a17:906:5c0d:: with SMTP id e13-v6mr943871ejq.183.1538558316866; Wed, 03 Oct 2018 02:18:36 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id m15-v6sm192366ejq.24.2018.10.03.02.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 02:18:35 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/18] drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check Date: Wed, 3 Oct 2018 11:18:25 +0200 Message-Id: <20181003091827.25276-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20181003091827.25276-1-daniel.vetter@ffwll.ch> References: <20181002133526.13685-1-daniel.vetter@ffwll.ch> <20181003091827.25276-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , Daniel Vetter , Intel Graphics Development , VMware Graphics Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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). 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 Reviewed-by: Ville Syrjälä --- 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 1b2a406b7742..8e3e262b6ef4 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) {