From patchwork Fri Jun 12 16:00:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11601971 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 23EAA913 for ; Fri, 12 Jun 2020 16:01:29 +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 0221E207F7 for ; Fri, 12 Jun 2020 16:01:29 +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="XTWQU2de" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0221E207F7 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 475266E9FF; Fri, 12 Jun 2020 16:01:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id E31136E9FB for ; Fri, 12 Jun 2020 16:01:09 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id c71so8635933wmd.5 for ; Fri, 12 Jun 2020 09:01:09 -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=pn56G4iAxisvD6U7wjR2uNhTGqn/jGSOsTr1HNhqABU=; b=XTWQU2de5rAOucOiWvsPhfnP5VwVuTBZUKzCS2N3jH6RmctUhv7u943icI4DG98zWn +KdAKXo2ity/gUyO93o5x/3gMnNTvu6cRTRwmgL+6UQORzWKRdkivwQpsK4i4hSx8vTI aIp5iv4O8a1uKESb83DFyA6hZTnpUtNWmuAkE= 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=pn56G4iAxisvD6U7wjR2uNhTGqn/jGSOsTr1HNhqABU=; b=mfO54KknaPzqMk0pOE53W1ZTy0f2Tm1eW7gHdylfxPH5MlS7gdxtMjJORsPKReguvC j/Y4RGw9+EMhp5a6rWDxruEUDZrpRPikXGIxqTqkWlRp5+QbCHb3CiPDKL5tXYk/enqM sIRKH+Nk/3qjRKr3SPFsN7RtLGCaTOtoFPfXud6WLW+oQhWjSDfY3OLjNrGrMouzml3c 1V80UUT65o9YJNIiXxDsl1bi8yNwocg+MjjbWYIJBmvVSlYy0/lBsvavFwPpPn6OpTOz TvYbyqG55oULrY8LWsxEITvj2iSrZi1UYZZXJKHaByu9/Ln7jPYujJAfUPs6RgbilQ/T cYvQ== X-Gm-Message-State: AOAM5330T0RvvKjiTE/LvgjEgWve+8PwI2TRkGBkKo/qC83wjB8UoPFz 33/wdJK1xkUhBDh8iF5Fqv7YVcYWvIk= X-Google-Smtp-Source: ABdhPJyZzSczjW7Bq2lQ0uzd3oHCsukXcf8Tuz+WZjmGRePnFqkJFl2jr+r4pUKucQTTsTIRu3SkeA== X-Received: by 2002:a1c:5541:: with SMTP id j62mr13316964wmb.64.1591977668363; Fri, 12 Jun 2020 09:01:08 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id j5sm10801566wrq.39.2020.06.12.09.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 09:01:07 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 5/8] drm/vc4: Use __drm_atomic_helper_crtc_reset Date: Fri, 12 Jun 2020 18:00:53 +0200 Message-Id: <20200612160056.2082681-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612160056.2082681-1-daniel.vetter@ffwll.ch> References: <20200612160056.2082681-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 , Intel Graphics Development , 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. Signed-off-by: Daniel Vetter Cc: Eric Anholt Reviewed-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_crtc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 29131409a4de..5371e63cf6e2 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -993,10 +993,9 @@ vc4_crtc_reset(struct drm_crtc *crtc) { if (crtc->state) vc4_crtc_destroy_state(crtc, crtc->state); - crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL); if (crtc->state) - crtc->state->crtc = crtc; + __drm_atomic_helper_crtc_reset(crtc, crtc->state); } static const struct drm_crtc_funcs vc4_crtc_funcs = {