From patchwork Fri Jun 12 20:49:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11602291 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 0FAD0912 for ; Fri, 12 Jun 2020 20:49:53 +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 E2227207ED for ; Fri, 12 Jun 2020 20:49:52 +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="bknKxuRZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2227207ED 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 2A6F96E1D6; Fri, 12 Jun 2020 20:49:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D3706E1D5 for ; Fri, 12 Jun 2020 20:49:47 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id c3so11249378wru.12 for ; Fri, 12 Jun 2020 13:49:47 -0700 (PDT) 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=XIgjIzPFIgBI4EmyoK38np1WAjTN8clhgllj8ppmN0o=; b=bknKxuRZkahxMHOgE9ynpDquNqp6yw7USyhNiDp1nm0tVtAVJ7+8dSuU9K13Md8846 Q0aWKqLm1+Cl8/2Vw6wjjsWhVxBMHtUt1PzZHRx4eDmx6g+QUn7nnAL3NcVs9vSrlYdy oInRDbFKGlgIVhFVpvdfG+FjCYzR7W98P8yV8= 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=XIgjIzPFIgBI4EmyoK38np1WAjTN8clhgllj8ppmN0o=; b=TLckYUJh3UD8K6uHPDUIG52/uD3wfiaFhw5CHcnp3Ja3yu9N5cEayL+C1BH59LwzWv G1Rma/+MoPtSxbyVH/snEX4A/PAA0NYd1AxeGXdkmvUHtgqfOArV03Oj4O7FXEZmy1Yz AmvVK+0Z3Xoc7LirIaIY/y00FPWXUSNloh+5QhxQcVawJGs+btc9yQJevZEmbb1wBug6 0qu8/fhNaLzZGurkuCQfZoiHeyJbxbyCsjahkmBCU7rCUJC72xFUhVwQvNJu8eilQUJa 7MwUfwP6oeDjr+wbmLoOql5L/U9QHdXfo03wyRBeBcSDPiHk6YQ3B7OWA9nQhd+zAmQc lmTA== X-Gm-Message-State: AOAM533Or2JgELBpXAy1CqmAhRIJDZFxKri4zJF4V9uxi8mXcb4DJVun YtDoWpzrz9MMivwW1FSSqJukticVJ/k= X-Google-Smtp-Source: ABdhPJzCs81BOXZQABnrH6PiF+mNU4ln7OpSkG0b0FLaXNTTrsuHx3nfSdG8xpcXE91hBXJljqvFEg== X-Received: by 2002:adf:e604:: with SMTP id p4mr16403880wrm.212.1591994985834; Fri, 12 Jun 2020 13:49:45 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id a7sm10811284wmh.14.2020.06.12.13.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 13:49:45 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/vmwgfx: Use __drm_atomic_helper_crtc_reset Date: Fri, 12 Jun 2020 22:49:40 +0200 Message-Id: <20200612204940.2134653-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612160056.2082681-6-daniel.vetter@ffwll.ch> References: <20200612160056.2082681-6-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: Roland Scheidegger , Daniel Vetter , Intel Graphics Development , VMware Graphics , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now also comes with the added benefit of doing a drm_crtc_vblank_off(), which means vblank state isn't ill-defined and fail-y at driver load before the first modeset on each crtc. v2: Compile fix. Oops. Signed-off-by: Daniel Vetter Cc: VMware Graphics Cc: Roland Scheidegger Reviewed-by: Roland Scheidegger --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3c97654b5a43..bbce45d142aa 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -629,8 +629,7 @@ void vmw_du_crtc_reset(struct drm_crtc *crtc) return; } - crtc->state = &vcs->base; - crtc->state->crtc = crtc; + __drm_atomic_helper_crtc_reset(crtc, &vcs->base); }