From patchwork Wed Feb 28 19:19:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10249427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 629E060594 for ; Wed, 28 Feb 2018 19:19:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C4D628DB1 for ; Wed, 28 Feb 2018 19:19:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40E6228E3A; Wed, 28 Feb 2018 19:19:58 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 DE70928DB1 for ; Wed, 28 Feb 2018 19:19:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D4366EB5A; Wed, 28 Feb 2018 19:19:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb0-x242.google.com (mail-yb0-x242.google.com [IPv6:2607:f8b0:4002:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E34CD6EB49 for ; Wed, 28 Feb 2018 19:19:17 +0000 (UTC) Received: by mail-yb0-x242.google.com with SMTP id e142-v6so1237689ybc.13 for ; Wed, 28 Feb 2018 11:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e0EzLjfRtPD8e8pUy6GqC2l9jRdTfj5h1BmOJp7K9tQ=; b=OBeN+HM3L+aQDcUxG88gFJowH7i+V0jOaNx8fD6ewCKsw2wrI4Fz0VYfmikV23csrq CI+tehUOV+fTFzmpn73pE1s4OSs4BLgryF16dPccgVGVhXg6IPo5iqlgAWqwYctyq7Vz ZZN5Pq6c9FrgnMdHVYjkOiv8QnJTSx1R4Zbow= 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; bh=e0EzLjfRtPD8e8pUy6GqC2l9jRdTfj5h1BmOJp7K9tQ=; b=o2SkXVse+VZ60kFuEySKf0lLcmkzy4BJyYUgmUDqRF5cxWlrCdev4rckTHbvNrGDlA XsBcoqmUHWohNFHqMSa8n6zXr79iGXhBFSwWwDBKqjNAAcfmTLXhdeJTw+p3ETcidImx ik2Jz5hm+CKcrWRjzUEH9z61VkbF/euDE3ocDicoSwLKeGp5VwBOs9kHPB4QYJMzKBTQ ObXewt7v+xsJ5eTznZonHss6wwDALvepquc/L4A48Qa+DfMXlFTwDyS+2lgea3JmbpZH Qms6Gd6asvzhrdmlng3J6mNGxsfVyZ65wbcuVWIoa4szrdYu43l9ph1Ec4rX5JNXaUEn kzJg== X-Gm-Message-State: APf1xPAJ2e/DmT1eteXJlUj9S0d3xqb0dP8GWp/t19m2NjyZVY6Rc1cp uskyjDZwXNTPzjB5gU6fRNzLk2Udiw4= X-Google-Smtp-Source: AG47ELvVR/qaNZBbxbgLdrW1u/L7LHqoFGJZ3q/OEPvK0B6e1aZjZlvptacs635gygh8UvX+X6zkAQ== X-Received: by 2002:a25:8391:: with SMTP id t17-v6mr1902227ybk.225.1519845557093; Wed, 28 Feb 2018 11:19:17 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id u62sm884594ywa.19.2018.02.28.11.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 11:19:16 -0800 (PST) From: Sean Paul To: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [DPU PATCH 09/11] drm/msm: Remove prepare_fence kms_function Date: Wed, 28 Feb 2018 14:19:04 -0500 Message-Id: <20180228191906.185417-10-seanpaul@chromium.org> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog In-Reply-To: <20180228191906.185417-1-seanpaul@chromium.org> References: <20180228191906.185417-1-seanpaul@chromium.org> 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: hoegsberg@chromium.org, abhinavk@codeaurora.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is the last piece that is keeping us from matching the atomic helper commit function. By removing this (now unused) hook, we can switch to drm_atomic_helper_commit() Change-Id: I081056a6e1689807871f5deedc76499bb91b6969 Signed-off-by: Sean Paul Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/msm_atomic.c | 10 ---------- drivers/gpu/drm/msm/msm_kms.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 1f53262ea46b..204c66cbfd31 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -169,16 +169,6 @@ int msm_atomic_commit(struct drm_device *dev, */ BUG_ON(drm_atomic_helper_swap_state(state, false) < 0); - /* - * Provide the driver a chance to prepare for output fences. This is - * done after the point of no return, but before asynchronous commits - * are dispatched to work queues, so that the fence preparation is - * finished before the .atomic_commit returns. - */ - if (priv && priv->kms && priv->kms->funcs && - priv->kms->funcs->prepare_fence) - priv->kms->funcs->prepare_fence(priv->kms, state); - /* * Everything below can be run asynchronously without the need to grab * any modeset locks at all under one conditions: It must be guaranteed diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 4c5a69258c42..25800c046bd1 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -60,8 +60,6 @@ struct msm_kms_funcs { void *(*duplicate_state)(void *state); void (*destroy_state)(void *state); /* modeset, bracketing atomic_commit(): */ - void (*prepare_fence)(struct msm_kms *kms, - struct drm_atomic_state *state); void (*prepare_commit)(struct msm_kms *kms, struct drm_atomic_state *state); void (*commit)(struct msm_kms *kms, struct drm_atomic_state *state);