From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C5022C282CD for ; Mon, 3 Mar 2025 16:58:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B94310E4A7; Mon, 3 Mar 2025 16:58:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=treblig.org header.i=@treblig.org header.b="HhOkGXS9"; dkim-atps=neutral Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) by gabe.freedesktop.org (Postfix) with ESMTPS id EEC7F10E4A7 for ; Mon, 3 Mar 2025 16:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=Content-Type:MIME-Version:Message-ID:Subject:From:Date:From :Subject; bh=eify1ppexQzLZIydQf1js6wBEcaTPRspfLPDS+j4sgM=; b=HhOkGXS9hzrPnBgG js0R3iDuM827LR2ODfImua1CO958uEBMOAST+8q+d2jCg+JA9Dn/4xk52j8Yt8imzwo40/QDKTvIm /9Qiw9DrKkmvN32vYK0M7qmcYQnFVtZ2Ja1qsp+ZXtrfBKwqfA0TGgHsCr+fZPPoWgAeVhyFVoi69 q4yhC8y3nXluzbdXXjEmFUJP1Wt97s1RTIYNZ/NkrO2R53mfR65TGeacKpZe/OQr5zKkR0bsEkx6u 2pJbxV5a3xOBLihnQNicSxMWvuhhB1NlfvlSx6aZnqQuevwJOeBE8LxoYvyh2vQ0ioeKzyv30ozRk K5+iA/7THNCyJW28aQ==; Received: from dg by mx.treblig.org with local (Exim 4.96) (envelope-from ) id 1tp97a-002BjV-2Q; Mon, 03 Mar 2025 16:58:26 +0000 Date: Mon, 3 Mar 2025 16:58:26 +0000 From: "Dr. David Alan Gilbert" To: Dmitry Baryshkov , tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch Cc: ville.syrjala@linux.intel.com, jfalempe@redhat.com, tomi.valkeinen@ideasonboard.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/3] Revert "drm/client: Add drm_client_modeset_check()" Message-ID: References: <20241029234706.285087-1-linux@treblig.org> <20241029234706.285087-4-linux@treblig.org> <4ysvn7vcynvmjc53frgj2nwuctf6kd6xdphgfjm3ulgfaxwngm@mod6oqvfmxav> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <4ysvn7vcynvmjc53frgj2nwuctf6kd6xdphgfjm3ulgfaxwngm@mod6oqvfmxav> X-Chocolate: 70 percent or better cocoa solids preferably X-Operating-System: Linux/6.1.0-21-amd64 (x86_64) X-Uptime: 16:57:31 up 299 days, 4:11, 1 user, load average: 0.06, 0.05, 0.00 User-Agent: Mutt/2.2.12 (2023-09-09) 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" * Dmitry Baryshkov (dmitry.baryshkov@linaro.org) wrote: > On Tue, Oct 29, 2024 at 11:47:05PM +0000, linux@treblig.org wrote: > > From: "Dr. David Alan Gilbert" > > > > drm_client_modeset_check() was explicitly added in 2020 by > > commit 64593f2a6fc9 ("drm/client: Add drm_client_modeset_check()") > > but has never been used. > > > > This reverts commit 64593f2a6fc933bb9a410bc3f8c261f3e57a9601. > > Nit: Usually this comes before the commit message. No need for repost > though. > > > Reviewed-by: Dmitry Baryshkov Hi, Can drm pick this up please? Thanks, Dave > > > > > Signed-off-by: Dr. David Alan Gilbert > > --- > > drivers/gpu/drm/drm_client_modeset.c | 35 ++++------------------------ > > include/drm/drm_client.h | 1 - > > 2 files changed, 4 insertions(+), 32 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c > > index cee5eafbfb81..39201c11eaac 100644 > > --- a/drivers/gpu/drm/drm_client_modeset.c > > +++ b/drivers/gpu/drm/drm_client_modeset.c > > @@ -995,7 +995,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) > > } > > EXPORT_SYMBOL(drm_client_rotation); > > > > -static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active, bool check) > > +static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active) > > { > > struct drm_device *dev = client->dev; > > struct drm_plane *plane; > > @@ -1062,10 +1062,7 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool > > } > > } > > > > - if (check) > > - ret = drm_atomic_check_only(state); > > - else > > - ret = drm_atomic_commit(state); > > + ret = drm_atomic_commit(state); > > > > out_state: > > if (ret == -EDEADLK) > > @@ -1126,30 +1123,6 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client) > > return ret; > > } > > > > -/** > > - * drm_client_modeset_check() - Check modeset configuration > > - * @client: DRM client > > - * > > - * Check modeset configuration. > > - * > > - * Returns: > > - * Zero on success or negative error code on failure. > > - */ > > -int drm_client_modeset_check(struct drm_client_dev *client) > > -{ > > - int ret; > > - > > - if (!drm_drv_uses_atomic_modeset(client->dev)) > > - return 0; > > - > > - mutex_lock(&client->modeset_mutex); > > - ret = drm_client_modeset_commit_atomic(client, true, true); > > - mutex_unlock(&client->modeset_mutex); > > - > > - return ret; > > -} > > -EXPORT_SYMBOL(drm_client_modeset_check); > > - > > /** > > * drm_client_modeset_commit_locked() - Force commit CRTC configuration > > * @client: DRM client > > @@ -1168,7 +1141,7 @@ int drm_client_modeset_commit_locked(struct drm_client_dev *client) > > > > mutex_lock(&client->modeset_mutex); > > if (drm_drv_uses_atomic_modeset(dev)) > > - ret = drm_client_modeset_commit_atomic(client, true, false); > > + ret = drm_client_modeset_commit_atomic(client, true); > > else > > ret = drm_client_modeset_commit_legacy(client); > > mutex_unlock(&client->modeset_mutex); > > @@ -1246,7 +1219,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode) > > > > mutex_lock(&client->modeset_mutex); > > if (drm_drv_uses_atomic_modeset(dev)) > > - ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON, false); > > + ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON); > > else > > drm_client_modeset_dpms_legacy(client, mode); > > mutex_unlock(&client->modeset_mutex); > > diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h > > index bc0e66f9c425..ead3c3526ee3 100644 > > --- a/include/drm/drm_client.h > > +++ b/include/drm/drm_client.h > > @@ -177,7 +177,6 @@ int drm_client_modeset_create(struct drm_client_dev *client); > > void drm_client_modeset_free(struct drm_client_dev *client); > > int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height); > > bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation); > > -int drm_client_modeset_check(struct drm_client_dev *client); > > int drm_client_modeset_commit_locked(struct drm_client_dev *client); > > int drm_client_modeset_commit(struct drm_client_dev *client); > > int drm_client_modeset_dpms(struct drm_client_dev *client, int mode); > > -- > > 2.47.0 > > > > -- > With best wishes > Dmitry > -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/