Received: by 2002:a05:7412:bc1a:b0:d7:7d3a:4fe2 with SMTP id ki26csp734026rdb; Sat, 19 Aug 2023 23:50:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS//g1do1HZSQgTsS/Muo8jfyVoiJtWVNvxAAyOHlsPdhhxSMjU21B2Lh08mYjNY0/mxES X-Received: by 2002:a05:6a20:8e19:b0:13e:1d49:723c with SMTP id y25-20020a056a208e1900b0013e1d49723cmr4392229pzj.2.1692514232359; Sat, 19 Aug 2023 23:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692514232; cv=none; d=google.com; s=arc-20160816; b=L6sC34Eq1PRIw4n+XaLLS4MVmmvQA9Vos7tIBqYYu/AZtVpEg5YCHdX7BsX32K+lmv UFkBjCzO1WNtuqU6mh7YOQxo8IMvcniUFcQoe5VgY9k7ZFLx3flWgJM17BhD0lgt6mz/ nuFKm1qadrXfUrP/rrwNsUJ7nokf8JlCH/e6StRd3/iqix5Zrv5PKtQcufmAxcVAHPH6 EEjddpiDKBD1PSGa4M85edOo/LvtTFyjY6grJGZIPVeAymomU8hcd3u1O5Isz8iwqzr3 tK1ttieXULnV7VO6Kn4G1RyvamPGwj1h2EdBecOqd763Lfm/+V2rszTjYtajhespjgtB Q0Pg== 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=jwiPoUYFkSBoF1XCgFaeI7PF5NfocC//QvuSLo8dBFw=; fh=OmmZDJEp3pl7jaFV8O2/yN66VkuJIFqajAiD2ZUHFno=; b=ZdQT/FDDrp34TfZLOKKnXnaqPWTDbKbisgoFVW6UL0TkKJvogC1L4Ygz2D5elqcx7w UhdFYNJeOXlxIi12/ksmFcLLLaee16w8tMhKuNpxt0HwKFxeuscJx3zZY79TpYKztAyZ xUDyulq5t+H+RXs+uudIX0noHbsXFjWvhU5h/jKWg/Fo8p7LhS3+6qTm0yHYO506gZYI Gws5wZfHTTNJ+bDe4U2b5l4BaPFBPf6qxx4fqRV+2Afiwc/n+dItYtzY8iCzttJhaIq4 iv/5HQ8Kk4iI5B7XYUwB+7KyEixIiifUtwOr2L3Ti7zJwtls3v6/szX28IkpxoA/k6Qu dysg== 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:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id v135-20020a63618d000000b00565f182839asi4451842pgb.28.2023.08.19.23.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 23:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E84F52CB1E6; Sat, 19 Aug 2023 11:49:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243999AbjHPKpI (ORCPT + 99 others); Wed, 16 Aug 2023 06:45:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244049AbjHPKpB (ORCPT ); Wed, 16 Aug 2023 06:45:01 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F3B42D67 for ; Wed, 16 Aug 2023 03:44:42 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5d0c:f209:12a7:4ce5]) by michel.telenet-ops.be with bizsmtp id aAkf2A00V45ualL06Akf1F; Wed, 16 Aug 2023 12:44:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qWE0v-000orE-C8; Wed, 16 Aug 2023 12:44:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qWDAx-00677J-6v; Wed, 16 Aug 2023 11:50:51 +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 , Laurent Pinchart Subject: [PATCH v3 40/41] drm: renesas: shmobile: Atomic conversion part 3 Date: Wed, 16 Aug 2023 11:50:47 +0200 Message-Id: <558d0dba353bcf3879493c79f9442a6a9b9af7a6.1692178020.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE autolearn=no 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 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 --- v3: - No changes, v2: - Add Reviewed-by. --- 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 e4d176b1f47654a8..729028a15efae00c 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -501,7 +501,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, @@ -581,9 +580,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 b7643884b49f0bc8..58a16efde4e3cb4f 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", -- 2.34.1