From patchwork Thu Jun 22 09:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 111569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4937722vqr; Thu, 22 Jun 2023 02:34:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7q064lO4mzi3jINEIrS4dtsMdBd/PTOhA/AFpYFKDrPEPFyY6kiImXKTynGvEW9Y0LHU36 X-Received: by 2002:a05:6358:e913:b0:131:efb:9 with SMTP id gk19-20020a056358e91300b001310efb0009mr4148929rwb.10.1687426439994; Thu, 22 Jun 2023 02:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687426439; cv=none; d=google.com; s=arc-20160816; b=wuUT5Mce581O7WpersCs5HW6ZsLO8bDZIBnoB7Uiha+hXXRyQxfnutObLSySjSei44 Vbr++OmRmG85hT2hZcJ7OJ7G3HV+f1ZcPdlyDJlI3KB4uDJ4M+wHgbbK5IApFtGfESZB Z23CNxgeh0gpsDfTvgPISMQBCnRgVjs4uBhMHSiuQWdMffhTG2vBeMQ4qgTL901caJCz OC0Z4J4Nafz+7jK3vis9ltz56FcA/9MD5X8ddai9qgZW4Hk30n3SBOlF6kZMjJiYp8gw o6n6iLTxUEmIZslpHcJSN+QSqTxdwnfjGTBaen+HkT5G0D1EkQq/CLryDryeIAvMYcro KCTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jhRQDUeUyz/5Tg8w+83jQpfugWNRcB5g96OjKKr9VLk=; b=ohVCzlDzQdiUXCJxpMdYB3NJeVBbQZAVkYHZ70qyZaKsnUp/1aEjjeT88NrUO28udI fD4eae22/o60fU3MFauwXVIoIlSyiML/mayDi3jBmoFG35pXsdM8GV1Gfb1X7eP3yvs7 ewTEm/H2LpbUjMzZTHesRKAsH6blDC1u89bT+LI+avQYyCN4f/98wxocJAddU8UpPvSl EzOeza94Qns2kFw0VrFSpBykNP4Bg9UR0aeovROanI66IOaKqmwh8rklMqgK6d5x8+Hz cMNkq2GCtvvIQYQ9Yas733kx6DtcF4q3Wvm0KKihjYEd+bXIMU1h3f8uUJUmfwCWulcN ycaw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z8-20020a63b908000000b0054fe76b4c0esi2314789pge.862.2023.06.22.02.33.41; Thu, 22 Jun 2023 02:33:59 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232404AbjFVJcK (ORCPT + 99 others); Thu, 22 Jun 2023 05:32:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjFVJaC (ORCPT ); Thu, 22 Jun 2023 05:30:02 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13C3A4236 for ; Thu, 22 Jun 2023 02:22:49 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed20:991a:a831:ea4b:6058]) by albert.telenet-ops.be with bizsmtp id C9Nk2A0091yfRTD069NkkX; Thu, 22 Jun 2023 11:22:44 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qCGWY-000Bxv-Cx; Thu, 22 Jun 2023 11:22:44 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qCGWa-003Vya-03; Thu, 22 Jun 2023 11:22:44 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 38/39] drm: renesas: shmobile: Atomic conversion part 3 Date: Thu, 22 Jun 2023 11:21:50 +0200 Message-Id: <9fcb81f939a6c4f09204f084519bf29d993b005a.1687423204.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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?1769394866844942774?= X-GMAIL-MSGID: =?utf-8?q?1769394866844942774?= Complete the conversion to atomic mode setting by converting the connector, and setting the DRIVER_ATOMIC flag. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 5 +---- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index f2332bb0fbbd51a1..17456dde57637ab8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -574,7 +574,6 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) } static const struct drm_connector_funcs connector_funcs = { - .dpms = drm_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = shmob_drm_connector_destroy, @@ -644,9 +643,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, if (ret < 0) goto error; - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - drm_object_property_set_value(&connector->base, - sdev->ddev.mode_config.dpms_property, DRM_MODE_DPMS_OFF); + connector->dpms = DRM_MODE_DPMS_OFF; sdev->connector = connector; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index c43f408d6b1fcc5b..576869164479ec6b 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -98,7 +98,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_DMA_FOPS(shmob_drm_fops); static const struct drm_driver shmob_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, DRM_GEM_DMA_DRIVER_OPS, .fops = &shmob_drm_fops, .name = "shmob-drm",