From patchwork Tue Jul 18 16:54:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1906088vqt; Tue, 18 Jul 2023 10:39:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlHIibBFVVWxvCwKY/poSH4UbOe7CkJU6090CvLSeiu9c9CKI5WMCm+AtqwVSVA209DD/Np2 X-Received: by 2002:aa7:d615:0:b0:51e:1643:5ad0 with SMTP id c21-20020aa7d615000000b0051e16435ad0mr446051edr.8.1689701964573; Tue, 18 Jul 2023 10:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689701964; cv=none; d=google.com; s=arc-20160816; b=zwsX3QQyslnEAh8TNr3vLFpjbUyavxOW3JO6SJGkOp7+/czfvXQnVGgt6fAsl6B3Nx jexWQrkXq+6GrNhckS51y4T39tPlvaseEYgNPV+oYhEbSDxbdQM3lZtN3F27eYYuJV6b Ao23EVcfg4TTHRzcGAfEeiakzA62Fme3SvYYQj1UDjDylFUYJtvd/d3F2i0LAHDp25q9 K1hgtwt9ENvJ9q3wzbVHplWMkHrevaHYiuj16Js5DDpHeiRrgvEBLCx0gotLJRb677LV 4e2qomT4D1T/yspOVYHUd6VDQmkyoG/AKFiyt7J7BSdt6QInYxq1m9tQtvRauLTfeN7e lalg== 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=yBBoInMRYaDsjkBZEr/B5dhm2+rgLacHxbAZJiMekF4=; fh=Ople2ijcDVdvBJwvAg2RvyZp0qNZK7It46SN0LxlrVk=; b=GhyeWbnpAUeQIZUREqjkPGQnQ1j9J/Gd9c3Vfs9MZmj3Ovag+PXXAJwjjC1z2arodc jD/edZkkEiCPtQJNwFk6D6XeR+yoSQcPyE9FXmEI6wXPMqDY+MQ1g7pnweHw54Xnlz6o /aUpXSQXR5RwshEiI3Utz4h9a0hEC4nSV52HhSmAzE0ta10pf5Cjyc56WOb4yRaR1JIa 83Fp9nllnLKzOL0Vi5rDb97CL0KkgqES8p2ckuLGg212mFW1ji9YxlaR4Nh1XCq9b57j yKLv4uILL9chhDTh9CF3PRGhLU6cVsOA6s7D6+cn89d5yDV09poL89mNLWVe2zlnpeE4 ZAag== 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 j11-20020aa7c0cb000000b0051debd504casi1599240edp.160.2023.07.18.10.39.00; Tue, 18 Jul 2023 10:39:24 -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 S233451AbjGRQ4S (ORCPT + 99 others); Tue, 18 Jul 2023 12:56:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232852AbjGRQzD (ORCPT ); Tue, 18 Jul 2023 12:55:03 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1D2D1BC0 for ; Tue, 18 Jul 2023 09:54:55 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by xavier.telenet-ops.be with bizsmtp id Ngus2A0031C8whw01gus1Y; Tue, 18 Jul 2023 18:54:53 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001na6-Qs; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000geJ-Rh; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v2 40/41] drm: renesas: shmobile: Atomic conversion part 3 Date: Tue, 18 Jul 2023 18:54:45 +0200 Message-Id: <7d43277a392ca26f197451296ffb910a001476f0.1689698048.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=unavailable 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: INBOX X-GMAIL-THRID: 1771780927432988837 X-GMAIL-MSGID: 1771780927432988837 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 --- 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",