From patchwork Fri Dec 13 17:26:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291245 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 503452D33 for ; Fri, 13 Dec 2019 21:04:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 188F9246D4 for ; Fri, 13 Dec 2019 21:04:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Tu7zU7lw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 188F9246D4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A994F6EB6B; Fri, 13 Dec 2019 17:26:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DB206EB6B for ; Fri, 13 Dec 2019 17:26:29 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id q6so242318wro.9 for ; Fri, 13 Dec 2019 09:26:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=viKraVC/bKAlbkdKhupkC+IBXqisO/o7XMPk0rhWWxg=; b=Tu7zU7lw/Vey0KJWrWKmUAFmKGC6stwk9BGu+WtQpewM0dRJkhbeThnQRNgsiaChkw pSvt5frmolgc4ZfquqpOt1MH/KOAXLKzp5TJW8aQzRi95IiCEJT6Q9YTIaDwN8rcwJTv NS8ESyNH3YHaShXtVpvH1EeULGrwLzQGGIZds= 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=viKraVC/bKAlbkdKhupkC+IBXqisO/o7XMPk0rhWWxg=; b=G44a+U6YRHQXpeIYrauSeCKuXARmjlqH8tGaI9IK5Ec+2NvRt47fBNN7nEX7mbgX/A FeRghgmOmejtIEupmtBQaYVTbIEaDe2y3mKLHIFBQTvqBJ73caAOWByqY8cbZq5nSvrN y/iXnpKCFjekVmo8zuKNuaYXw7qrDaC8bTTbz7s/gqu54LueM5d2ZI0pC0pIrx2z6BX6 nkLCvvnPR+ZhdKAwSVMepENw9/oTtybCJ6Bhy/lrOfPmPdmKk183i/77ttf1Ncuwsl/h LGtef800cfdjFYFxmFJ1pNc2G3ych/sjuqzAB3KrvbEbUoOohBEqetYk4oGWdKH8MlSD vtXw== X-Gm-Message-State: APjAAAWP+HLD8/XkHPY31GtTSaUu2VbUk8r090Yf1TAPveSgFZ9YQAPE BAopGocSMwzqZv5LiywmNZUZbZ33xGk= X-Google-Smtp-Source: APXvYqxQ+9PUz1RLVtYW3x8gEY6ZNC8xm3VQgmhZhPklJpiTVmquy0AuRMifB3HU1bSstQNujn0OsA== X-Received: by 2002:adf:f8c4:: with SMTP id f4mr13713640wrq.243.1576257987713; Fri, 13 Dec 2019 09:26:27 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:564b:0:7567:bb67:3d7f:f863]) by smtp.gmail.com with ESMTPSA id q15sm10689669wrr.11.2019.12.13.09.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:26 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/10] drm/vkms: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:11 +0100 Message-Id: <20191213172612.1514842-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> References: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> 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: , Cc: Daniel Vetter , Haneen Mohammed , Rodrigo Siqueira , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Rodrigo Siqueira Cc: Haneen Mohammed Cc: Daniel Vetter Reviewed-by: Rodrigo Siqueira Tested-by: Rodrigo Siqueira --- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 5fc8f85aaf3d..6d31265a2ab7 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -117,7 +117,7 @@ static int vkms_plane_atomic_check(struct drm_plane *plane, bool can_position = false; int ret; - if (!state->fb | !state->crtc) + if (!state->fb || WARN_ON(!state->crtc)) return 0; crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);