From patchwork Mon Jan 9 13:00:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddh Raman Pant X-Patchwork-Id: 3740 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2143115wrt; Mon, 9 Jan 2023 05:05:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXv2wjVW3Zq8DAqyqapgthq3MsnnLjvR8xlWJZ/ITAS8pd0dRauoV3SCsh7HHhzSoMRBk7FK X-Received: by 2002:aa7:d393:0:b0:490:47c3:3d78 with SMTP id x19-20020aa7d393000000b0049047c33d78mr15823897edq.1.1673269515356; Mon, 09 Jan 2023 05:05:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673269515; cv=pass; d=google.com; s=arc-20160816; b=KHEXCfeAcWxY0FzxUatHshKIK2LFxxHs+xdcd5YM4sx+Z1OP6gYhAnZ0hJy7nwx4ys ODRzOBXLD/2M4qv1s+7JC0OfytgSGH3LyUla1xncLm0F5wvRqL2la/+V07Sai0vVqAAb tca5tAp3FpYHFDPsMx8KIuJDLnpxbsrCZCOsjwMgO6ySMftprAUDimCi+PTC8mRlS+T7 XV6EQKX5ZJW5nZd2dcipnFQdHyK0H+Xn5RzLdmmeZJaAqPQ+ZRRYIRn3PoX6du7eDc7/ OpAm2LfF8lV9y9lIOh0mvNDLRO+LPUNszKLqj0hqk28XUPT93vNQMKTN9CshWZDnUhFa VJHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:date :subject:message-id:cc:to:from:dkim-signature; bh=MWekVh7g0aNC8fU4Gyt4wLdjrGx1HtGYSC6SCLpolcA=; b=o6K0QuQ93T2WUa7QI8IByx2LJlDIjIokIMziQ0kldmDe/BzWkN9x9RkcffSNWD5NEc dvhKacyvi5/f3YfnlDp3WpSyJ4+pDUlz4BH5/1bT/suiiPLYKZ0KbYnp5V3/UjhCe5dp tAYD6q2cWh1gHs+O/FTKYBfGc8qyxDJqY1JpJT+ReBcRWIfm5f60dr9dolcRmjjA6Wu1 qG3XNFYy7FYkt1dHeuuNhU+0px8YWh1xH0Qlf4Prk7EgeiAclu0HSDMl0QsJa6I28N4S 7qjwqOAsJuWRwkcfLGLXQzTe2eyj1r4lJq31yFTDeMFgAFSsol9zaRKPWgPNXsdKNpaK p7aw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@siddh.me header.s=zmail header.b=cB2ONmhb; arc=pass (i=1 spf=pass spfdomain=siddh.me dkim=pass dkdomain=siddh.me dmarc=pass fromdomain=siddh.me>); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siddh.me Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w19-20020a05640234d300b0046b7410c015si10223814edc.18.2023.01.09.05.04.50; Mon, 09 Jan 2023 05:05:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@siddh.me header.s=zmail header.b=cB2ONmhb; arc=pass (i=1 spf=pass spfdomain=siddh.me dkim=pass dkdomain=siddh.me dmarc=pass fromdomain=siddh.me>); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siddh.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234120AbjAINDZ (ORCPT + 99 others); Mon, 9 Jan 2023 08:03:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236744AbjAINCq (ORCPT ); Mon, 9 Jan 2023 08:02:46 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF41310FD for ; Mon, 9 Jan 2023 05:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673269250; cv=none; d=zohomail.in; s=zohoarc; b=WrMqFd4CwDYS0yLAf/tCBS7gqk/J3gieVzLllTXvNaBfJqroX1pNJz+RN3eWkFH6m6XjbGMOTaclEOCPyLt4kmpK8h9//4XYyHLhPZ0MoT99ycpp9fV6h/ABNb2dhCC1jYXPJYBL33OtZBHb3d5dLdTIvPXU/dvtopD0mpXkQ6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1673269250; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=MWekVh7g0aNC8fU4Gyt4wLdjrGx1HtGYSC6SCLpolcA=; b=KoO61Yi1UxZc9SAOUYsuAyk83xnJZcK9JS7RZ7GyHA8JEE383wTYT5jeqVUs/FjQabyha1yCKtewZBN8ELUVwD8IeO5HCFxm7O4mZbA8tUB97Gl6m2FySVjzo3siwShaOV8oytzl7rzLbxNtbV90HNyqWpk7djm42BY89AidHPg= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1673269250; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=MWekVh7g0aNC8fU4Gyt4wLdjrGx1HtGYSC6SCLpolcA=; b=cB2ONmhbwa4IPtOlS9w8Ka90G85pjKThkDAdhVBD8hjLvBCC5dl5M4qsWE4fY8sa ZCtVHgie3xhmRFwG45SYhvbS5PSBR2Ug06DyuYqsFvZ0x8TH46jOexQzI6BxxIjbyHj I3Sidat0XL74Rd2+31aW6Sf1973wGiViCFwlBYns= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1673269247710493.7155399455969; Mon, 9 Jan 2023 18:30:47 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser , Jim Cromie , Sam Ravnborg Cc: dri-devel , linux-kernel Message-ID: Subject: [PATCH v6 00/10] drm: Remove usage of deprecated DRM_* macros Date: Mon, 9 Jan 2023 18:30:25 +0530 X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-ZohoMailClient: External X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754550255588628654?= X-GMAIL-MSGID: =?utf-8?q?1754550255588628654?= This patchset aims to remove usages of deprecated DRM_* macros from the files residing in drivers/gpu/drm root. In process, I found out that NULL as first argument of drm_dbg_* wasn't working, but it was listed as the alternative in deprecation comment, so I fixed that before removing usages of DRM_DEBUG_* macros. Courtesy discussion on v1, I added support for NULL in drm_()* macros too. This patchset should be applied in order as changes might be dependent. Please review and let me know if any errors are there, and hopefully this gets accepted. --- v5 -> v6: - Move drm_device to default case in _Generic as it is the default behaviour. - Fix incorrect const drm_device handling in _Generic. - Minor positioning / comment changes. v4 -> v5: - Make separate function instead of using boolean in _Generic (sravn on IRC). - Also, simplified the Generic macro, and renamed the function and macro. v3 -> v4: - Fix commit message for DRM_NOTE erroneously mentioning DRM_INFO. - Rebased to drm-misc-next, as 723dad977acd added drm_dbg_core() to some files. - Move Generic out to a separate macro __drm_get_dev_ptr, so that interface of drm_dbg_*() is also same as other drm_*() macros. - Fix comment in __drm_get_dev_ptr (now ___drm_get_dev_ptr) to use correct name. v2 -> v3: - Added support for NULL in __drm_printk and thus by extension to drm_()*. - Thus, converted dropped pr_()* changes to drm_*(NULL, ...). - Rebased to drm-misc-next and resulting appropriate changes. v1 -> v2: - Removed conversions to pr_*() in DRM_INFO, DRM_NOTE, and DRM_ERROR changes. - Due to above, DRM_NOTE usage cannot be removed and the patch is dropped. - DRY: NULL support is now achieved by way of a separate function. Siddh Raman Pant (10): drm/print: Fix and add support for NULL as first argument in drm_* macros drm: Remove usage of deprecated DRM_INFO drm: Remove usage of deprecated DRM_NOTE drm: Remove usage of deprecated DRM_ERROR drm: Remove usage of deprecated DRM_DEBUG drm: Remove usage of deprecated DRM_DEBUG_DRIVER drm: Remove usage of deprecated DRM_DEBUG_KMS drm: Remove usage of deprecated DRM_DEBUG_PRIME drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE drivers/gpu/drm/drm_agpsupport.c | 4 +- drivers/gpu/drm/drm_blend.c | 13 ++- drivers/gpu/drm/drm_bridge.c | 8 +- drivers/gpu/drm/drm_bufs.c | 122 ++++++++++++------------ drivers/gpu/drm/drm_client_modeset.c | 118 +++++++++++++---------- drivers/gpu/drm/drm_color_mgmt.c | 4 +- drivers/gpu/drm/drm_connector.c | 28 +++--- drivers/gpu/drm/drm_context.c | 18 ++-- drivers/gpu/drm/drm_crtc.c | 36 ++++--- drivers/gpu/drm/drm_crtc_helper.c | 62 ++++++------ drivers/gpu/drm/drm_debugfs_crc.c | 8 +- drivers/gpu/drm/drm_displayid.c | 6 +- drivers/gpu/drm/drm_dma.c | 10 +- drivers/gpu/drm/drm_drv.c | 26 ++--- drivers/gpu/drm/drm_edid.c | 17 ++-- drivers/gpu/drm/drm_flip_work.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 3 +- drivers/gpu/drm/drm_gem.c | 7 +- drivers/gpu/drm/drm_gem_dma_helper.c | 6 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 +- drivers/gpu/drm/drm_hashtab.c | 10 +- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_kms_helper_common.c | 2 +- drivers/gpu/drm/drm_lease.c | 68 ++++++------- drivers/gpu/drm/drm_legacy_misc.c | 4 +- drivers/gpu/drm/drm_lock.c | 36 +++---- drivers/gpu/drm/drm_mipi_dbi.c | 19 ++-- drivers/gpu/drm/drm_mipi_dsi.c | 12 +-- drivers/gpu/drm/drm_mm.c | 8 +- drivers/gpu/drm/drm_mode_config.c | 2 +- drivers/gpu/drm/drm_mode_object.c | 6 +- drivers/gpu/drm/drm_modes.c | 36 +++---- drivers/gpu/drm/drm_modeset_helper.c | 2 +- drivers/gpu/drm/drm_pci.c | 14 +-- drivers/gpu/drm/drm_plane.c | 46 ++++----- drivers/gpu/drm/drm_probe_helper.c | 39 ++++---- drivers/gpu/drm/drm_rect.c | 4 +- drivers/gpu/drm/drm_scatter.c | 19 ++-- drivers/gpu/drm/drm_syncobj.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 22 ++--- drivers/gpu/drm/drm_vm.c | 45 +++++---- include/drm/drm_print.h | 116 ++++++++++++++++------ 42 files changed, 557 insertions(+), 463 deletions(-)