From nobody Thu Dec 18 14:09:58 2025 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AE562222C2 for ; Mon, 2 Jun 2025 13:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872345; cv=none; b=rootgrjsTdoQ4NbaPIxnZ2S9ftXDR7yiAvfGuzEGpDQ1e2VyTExfh0wa13f6hddq1GHUrGH66w3BnYB3xN0CtlR70bBDTF0JamjmChUiEsLXN2wBprlIYuJAAO6Sx639vcnMtMCXDtPO1b/YPZJ3rqEBzlnYXu86Nn/Ntof3GNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872345; c=relaxed/simple; bh=LSd9/fpCPtsGZPmlAsfnLlJYbeF6epl7x0bW4p+VSEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kCsbfc7MkCKHVWoN52uzrhssjZmIHEASBXGpmqtoXhNs/jk0LFrKHKpw1KNtKznoLdsMjTA5ulC1j2sEc4CXuFJM8WUiSYMDV7OBqDTfmoMwUPOQaXhM1lApsXPtOcu/nD4SLPoEGPuCDcoIdw3chpOE+kGqBzQc2Hl0ZNv6YJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=GKKotUtz; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="GKKotUtz" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=6ZmgMfTBNEthBAq/klOspYhOwxxljfCZMxlpW/laRVk=; b=GKKotUtzUpQvrFBI y9qrc40D9UPTbDPxEg/SZkzA9SHdL+iNrrKPTJqXJX5eyMc8elDZydN0VWvcraprC1sT7puOnzLfv XolSTOJXf+T6cP0NcNB4z0DNSeEuWzvPoPC83etyDM9BuMDDemmHifA/tkeFohRmr2NKYvAzs00bI H4GCFFwlA6lL3DjjD3rjksp75TrYGyLSH42kHLlzevW8zpBW+sWrl9q9EP7s5hQR5Li+2kCaNUu5f 4gORCfsOSKlcq/kCxv8Rgjl133RMTdY+IBqd89zcJtjV6AGDWexTKfAKjaYxkoykBoZ6f3Kr2RLF6 vU5lqUBUfKkwAIZS5A==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1uM5aA-007CLX-0i; Mon, 02 Jun 2025 13:52:06 +0000 From: linux@treblig.org To: dmitry.baryshkov@oss.qualcomm.com, lumag@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" , Dmitry Baryshkov Subject: [PATCH v3 1/3] drm: Remove unused drm_atomic_helper_commit_planes_on_crtc Date: Mon, 2 Jun 2025 14:51:59 +0100 Message-ID: <20250602135201.207466-2-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602135201.207466-1-linux@treblig.org> References: <20250602135201.207466-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The last use of drm_atomic_helper_commit_planes_on_crtc() was removed in 2018 by commit 6c246b81f938 ("drm/i915: Replace call to commit_planes_on_crtc with internal update, v2.") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_atomic_helper.c | 72 ----------------------------- include/drm/drm_atomic_helper.h | 1 - 2 files changed, 73 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index ee64ca1b1bec..b697644f2f37 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2743,8 +2743,6 @@ static bool plane_crtc_active(const struct drm_plane_= state *state) * crtcs need to be updated though. * * Note that this function does all plane updates across all CRTCs in one = step. - * If the hardware can't support this approach look at - * drm_atomic_helper_commit_planes_on_crtc() instead. * * Plane parameters can be updated by applications while the associated CR= TC is * disabled. The DRM/KMS core will store the parameters in the plane state, @@ -2871,76 +2869,6 @@ void drm_atomic_helper_commit_planes(struct drm_devi= ce *dev, } EXPORT_SYMBOL(drm_atomic_helper_commit_planes); =20 -/** - * drm_atomic_helper_commit_planes_on_crtc - commit plane state for a CRTC - * @old_crtc_state: atomic state object with the old CRTC state - * - * This function commits the new plane state using the plane and atomic he= lper - * functions for planes on the specific CRTC. It assumes that the atomic s= tate - * has already been pushed into the relevant object state pointers, since = this - * step can no longer fail. - * - * This function is useful when plane updates should be done CRTC-by-CRTC - * instead of one global step like drm_atomic_helper_commit_planes() does. - * - * This function can only be savely used when planes are not allowed to mo= ve - * between different CRTCs because this function doesn't handle inter-CRTC - * dependencies. Callers need to ensure that either no such dependencies e= xist, - * resolve them through ordering of commit calls or through some other mea= ns. - */ -void -drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_st= ate) -{ - const struct drm_crtc_helper_funcs *crtc_funcs; - struct drm_crtc *crtc =3D old_crtc_state->crtc; - struct drm_atomic_state *old_state =3D old_crtc_state->state; - struct drm_crtc_state *new_crtc_state =3D - drm_atomic_get_new_crtc_state(old_state, crtc); - struct drm_plane *plane; - unsigned int plane_mask; - - plane_mask =3D old_crtc_state->plane_mask; - plane_mask |=3D new_crtc_state->plane_mask; - - crtc_funcs =3D crtc->helper_private; - if (crtc_funcs && crtc_funcs->atomic_begin) - crtc_funcs->atomic_begin(crtc, old_state); - - drm_for_each_plane_mask(plane, crtc->dev, plane_mask) { - struct drm_plane_state *old_plane_state =3D - drm_atomic_get_old_plane_state(old_state, plane); - struct drm_plane_state *new_plane_state =3D - drm_atomic_get_new_plane_state(old_state, plane); - const struct drm_plane_helper_funcs *plane_funcs; - bool disabling; - - plane_funcs =3D plane->helper_private; - - if (!old_plane_state || !plane_funcs) - continue; - - WARN_ON(new_plane_state->crtc && - new_plane_state->crtc !=3D crtc); - - disabling =3D drm_atomic_plane_disabling(old_plane_state, new_plane_stat= e); - - if (disabling && plane_funcs->atomic_disable) { - plane_funcs->atomic_disable(plane, old_state); - } else if (new_plane_state->crtc || disabling) { - plane_funcs->atomic_update(plane, old_state); - - if (!disabling && plane_funcs->atomic_enable) { - if (drm_atomic_plane_enabling(old_plane_state, new_plane_state)) - plane_funcs->atomic_enable(plane, old_state); - } - } - } - - if (crtc_funcs && crtc_funcs->atomic_flush) - crtc_funcs->atomic_flush(crtc, old_state); -} -EXPORT_SYMBOL(drm_atomic_helper_commit_planes_on_crtc); - /** * drm_atomic_helper_disable_planes_on_crtc - helper to disable CRTC's pla= nes * @old_crtc_state: atomic state object with the old CRTC state diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helpe= r.h index 53382fe93537..1a704f5c8036 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -107,7 +107,6 @@ void drm_atomic_helper_commit_planes(struct drm_device = *dev, uint32_t flags); void drm_atomic_helper_cleanup_planes(struct drm_device *dev, struct drm_atomic_state *old_state); -void drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_cr= tc_state); void drm_atomic_helper_disable_planes_on_crtc(struct drm_crtc_state *old_crtc_s= tate, bool atomic); --=20 2.49.0 From nobody Thu Dec 18 14:09:58 2025 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F8531A01C6 for ; Mon, 2 Jun 2025 13:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872341; cv=none; b=a3bRy5Yk1asAOpsPxpEMJrQNJ0/bqcsXByp7SkNiaU8D8IuU/Bbxbzf0jgYqOiaq9mn2/yq6xPwzHwCwy4AMidUdbcqNWIve7EQQgSGSc5PKaJIB27YP1HVtbWZ8XIN0oc3xRAJkLznSEurzpNi4YDvkW+nz/xVBc9M7rHIQN3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872341; c=relaxed/simple; bh=L+m/igXlK4ID594l0yNTHEFJR1ds//pLQu7kOfxfW2c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BHXO8SF9O/ZmA7d4GCkucFrKwqe+C/PauRJ9sedLAMrA1xmNRWwFfGf3Nlxre3FTce8J1veLKhB+Mfe0duRZPVw1R0xUP6Epk0SGj1shqa35jft/FYAIVeBH8F01PhBVyT/edwBhmrycgijz0wHQygQ8r7eV11d1HLxbs/SkaGg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=EIXbOIjG; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="EIXbOIjG" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=WydCDlKnGQA2FYSf6N3259lRM2izOqqWzsrL/A03+NY=; b=EIXbOIjGyDqvxRXo h41Q2xX7ROAGoVo9kjNT24OCB6gBJBxxK26dY9OzcJx5qGq1+/Y7ed6EwEp/3j88ZLCcTvh/BXHxw tCx6X3GaI24MebsBrNRpbamPkrD2ohc2i4OwuqOuQ3hS823jaCMvgVNc1+V0UGlsUjMj8nVANdhHX VWgPl/enUFWzruc1qBj8RW5SMACMOYsnVnEXRpXmbDN0wuDFlErgiJ/L13VceTpcHAM6nhjJUhhto t/5LhKXXq/1uU2S0f8fDO2LxU0/QA2O8L471S3kJoLEulBzqPp0JrmbTHGAGQXbo54U0LqkFMGX0k GXGRQkmplNUtG01UdQ==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1uM5aA-007CLX-31; Mon, 02 Jun 2025 13:52:06 +0000 From: linux@treblig.org To: dmitry.baryshkov@oss.qualcomm.com, lumag@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" , Dmitry Baryshkov Subject: [PATCH v3 2/3] drm/sysfs: Remove unused drm_class_device_(un)register Date: Mon, 2 Jun 2025 14:52:00 +0100 Message-ID: <20250602135201.207466-3-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602135201.207466-1-linux@treblig.org> References: <20250602135201.207466-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" drm_class_device_register() and drm_class_device_unregister() have been unused since commit ed89fff97382 ("drm/ttm: drop sysfs directory") Remove them. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_sysfs.c | 32 -------------------------------- include/drm/drm_sysfs.h | 4 ---- 2 files changed, 36 deletions(-) diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 60c1f26edb6f..db92ee73cca7 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -548,35 +548,3 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor = *minor) put_device(kdev); return ERR_PTR(r); } - -/** - * drm_class_device_register - register new device with the DRM sysfs class - * @dev: device to register - * - * Registers a new &struct device within the DRM sysfs class. Essentially = only - * used by ttm to have a place for its global settings. Drivers should nev= er use - * this. - */ -int drm_class_device_register(struct device *dev) -{ - if (!drm_class || IS_ERR(drm_class)) - return -ENOENT; - - dev->class =3D drm_class; - return device_register(dev); -} -EXPORT_SYMBOL_GPL(drm_class_device_register); - -/** - * drm_class_device_unregister - unregister device with the DRM sysfs class - * @dev: device to unregister - * - * Unregisters a &struct device from the DRM sysfs class. Essentially only= used - * by ttm to have a place for its global settings. Drivers should never use - * this. - */ -void drm_class_device_unregister(struct device *dev) -{ - return device_unregister(dev); -} -EXPORT_SYMBOL_GPL(drm_class_device_unregister); diff --git a/include/drm/drm_sysfs.h b/include/drm/drm_sysfs.h index 96a5d858404b..7695873a9456 100644 --- a/include/drm/drm_sysfs.h +++ b/include/drm/drm_sysfs.h @@ -3,13 +3,9 @@ #define _DRM_SYSFS_H_ =20 struct drm_device; -struct device; struct drm_connector; struct drm_property; =20 -int drm_class_device_register(struct device *dev); -void drm_class_device_unregister(struct device *dev); - void drm_sysfs_hotplug_event(struct drm_device *dev); void drm_sysfs_connector_hotplug_event(struct drm_connector *connector); void drm_sysfs_connector_property_event(struct drm_connector *connector, --=20 2.49.0 From nobody Thu Dec 18 14:09:58 2025 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F8B6211A0E for ; Mon, 2 Jun 2025 13:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872341; cv=none; b=oZ2iuLlD1FpGhxXFK6mgDZaQtLSoxtFAb1F6FgiARxofTgdoLfYFWkIQVW1YBwythuvHC3yv4A3vu+0rMcKgo8iJVa+mHTFnB1/2FtrgIUh7a34Jifgho1vIjlHOj1APW+bB7PfOG0k0p+D4cYd1gMt0cNPAI85Xac/XLqjaSbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872341; c=relaxed/simple; bh=CFHqvgNE9b73k6YmsSW5HF2d2NOeePKLWcT5klVRYU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O0U2Dx7+aRotXCFlRkGkdj91a9Ke2xGoMcqAVZ1Vnx2pY9fw0BuFKubKntkvgmc964X4womR3F/eTc4nsQFJFPN0ucsW7K0fHddFm3jncbnl6Mb+YT6O6kYA/PJDLiltrxI1ymtZ2lo6jwcBytaj4j7vNaDf1q94IL6WPYlAJo8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=hYHBiRgM; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="hYHBiRgM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=nQnA2hQbzP8WZin9HMjdUuwpEMqqWDeL9smiJWMLtKA=; b=hYHBiRgMJWxNARrE 4ZgnanHme8vG8gWXREVCKBrNOb/oWR8qwOzrow8d81Kx9wiDd9lVeBROGobDrj7I8KK88bbRi6SDQ GUZP8maM2kcVxQEPOZh4pbIi59/SxioyLbecHGGTNblwvQHPopooWrZC2fXyqtMMKIn5JSQRsCavH xfnV11hGGRL8qVjgGcq6zx8MF8tepFesdAPyNihtoHoHRanPhHbjg8id2qrBNFW3TFUUmInHBJ4PN lX9Lo7x7omBmUCdHkyCb7Gsz5a91JwqhXTC84OgQtLQun0vmYPahdxWbna5BWVhHQcGgeY6KEX+qv ESvG3cC5d+9ZBDW9sg==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1uM5aB-007CLX-20; Mon, 02 Jun 2025 13:52:07 +0000 From: linux@treblig.org To: dmitry.baryshkov@oss.qualcomm.com, lumag@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" , Dmitry Baryshkov Subject: [PATCH v3 3/3] Revert "drm/client: Add drm_client_modeset_check()" Date: Mon, 2 Jun 2025 14:52:01 +0100 Message-ID: <20250602135201.207466-4-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602135201.207466-1-linux@treblig.org> References: <20250602135201.207466-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" This reverts commit 64593f2a6fc933bb9a410bc3f8c261f3e57a9601. drm_client_modeset_check() was explicitly added in 2020 by commit 64593f2a6fc9 ("drm/client: Add drm_client_modeset_check()") but has never been used. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Dmitry Baryshkov --- 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_cli= ent_modeset.c index 0f9d5ba36c81..b62f8f4553e5 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -1028,7 +1028,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset= , unsigned int *rotation) } EXPORT_SYMBOL(drm_client_rotation); =20 -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 =3D client->dev; struct drm_plane *plane; @@ -1095,10 +1095,7 @@ static int drm_client_modeset_commit_atomic(struct d= rm_client_dev *client, bool } } =20 - if (check) - ret =3D drm_atomic_check_only(state); - else - ret =3D drm_atomic_commit(state); + ret =3D drm_atomic_commit(state); =20 out_state: if (ret =3D=3D -EDEADLK) @@ -1159,30 +1156,6 @@ static int drm_client_modeset_commit_legacy(struct d= rm_client_dev *client) return ret; } =20 -/** - * 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 =3D 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 @@ -1201,7 +1174,7 @@ int drm_client_modeset_commit_locked(struct drm_clien= t_dev *client) =20 mutex_lock(&client->modeset_mutex); if (drm_drv_uses_atomic_modeset(dev)) - ret =3D drm_client_modeset_commit_atomic(client, true, false); + ret =3D drm_client_modeset_commit_atomic(client, true); else ret =3D drm_client_modeset_commit_legacy(client); mutex_unlock(&client->modeset_mutex); @@ -1280,7 +1253,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *cl= ient, int mode) =20 mutex_lock(&client->modeset_mutex); if (drm_drv_uses_atomic_modeset(dev)) - ret =3D drm_client_modeset_commit_atomic(client, mode =3D=3D DRM_MODE_DP= MS_ON, false); + ret =3D drm_client_modeset_commit_atomic(client, mode =3D=3D DRM_MODE_DP= MS_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 146ca80e35db..4e3aa3c7f00b 100644 --- a/include/drm/drm_client.h +++ b/include/drm/drm_client.h @@ -216,7 +216,6 @@ int drm_client_modeset_create(struct drm_client_dev *cl= ient); void drm_client_modeset_free(struct drm_client_dev *client); int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int w= idth, unsigned int height); bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotat= ion); -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); --=20 2.49.0