From patchwork Thu Oct 4 20:24:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10626649 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 94ECC15E2 for ; Thu, 4 Oct 2018 20:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87BF429717 for ; Thu, 4 Oct 2018 20:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C2662971C; Thu, 4 Oct 2018 20:26:18 +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 2BCC029717 for ; Thu, 4 Oct 2018 20:26:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B4CB6E68B; Thu, 4 Oct 2018 20:25:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by gabe.freedesktop.org (Postfix) with ESMTPS id BEFEA6E689 for ; Thu, 4 Oct 2018 20:25:25 +0000 (UTC) Received: by mail-ed1-x52c.google.com with SMTP id j62-v6so9744276edd.7 for ; Thu, 04 Oct 2018 13:25:25 -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=HuCsYK/3yXsOaV3A8gzCsBWL8MSDJhgbqO0HsQSiYkY=; b=hToKdvUEq1znVl5V/gB3+1aIFnNZilIWErAqfCljkqCWC0xmh5L4G0LMjaMXXp4lqC +vDNT1f5A/+4IKly3ENCz20e6CtfjEehQBotimN7gIuHtHfAXHqhYBeOAwkwCbli9MnH 6MQ9hHoGKFikh6ZvICK0LARPHzRjE6aHkfdrthvzsvRnf00bV5f1NvK4LtMrv9HZC7w2 vpBIt8Z8/k4xmyPTZYEHdxUkWRNQFM7ZgeUbPAsQv97bZVIBeUYLJaZek3nGta8DGBWY 0kovUod6xyepZZnj1SJ8hXAVVjhpFK24vq23U3yrx24wynU4CqjLl75SDKCrDy28KPKY WbAg== X-Gm-Message-State: ABuFfohzSMoD4ix6Tbf/HOfRozK37D9T6oU1z4UEwMlAoEn8uVKIQGTC 2yQPJjghFQQHJLWvAC+XDCxcSNBDMvw= X-Google-Smtp-Source: ACcGV61p+v3PeNCppudZN4cVU/Nimr2/qPC6n8gwlUnghBJVSo7UGhi6wJuwS7/CqrHI6tWIfwLVZg== X-Received: by 2002:a50:a588:: with SMTP id a8-v6mr10655808edc.289.1538684724049; Thu, 04 Oct 2018 13:25:24 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id y8-v6sm2040002edd.43.2018.10.04.13.25.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 13:25:22 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/21] drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check Date: Thu, 4 Oct 2018 22:24:41 +0200 Message-Id: <20181004202446.22905-17-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20181004202446.22905-1-daniel.vetter@ffwll.ch> References: <20181004202446.22905-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: Daniel Vetter , Thomas Hellstrom , 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). 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) {