From patchwork Thu Apr 2 14:17:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 6148531 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7EE4EBFFA8 for ; Thu, 2 Apr 2015 14:17:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97A9E2038D for ; Thu, 2 Apr 2015 14:17:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A565D20272 for ; Thu, 2 Apr 2015 14:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753327AbbDBORa (ORCPT ); Thu, 2 Apr 2015 10:17:30 -0400 Received: from mail-qc0-f182.google.com ([209.85.216.182]:33042 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753146AbbDBOR3 (ORCPT ); Thu, 2 Apr 2015 10:17:29 -0400 Received: by qcrf4 with SMTP id f4so55514163qcr.0 for ; Thu, 02 Apr 2015 07:17:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iAO/R5KM+vLtROtYbXP1zfq2Y4zFom2d+EtwqiIhVVY=; b=Bh4Hf3dZ0A8L0RDV+wHl3vCHQi2y5TzDU1oRMKB3IEZwoWFiYKdE/s0tAL4k1HIrXH ktCU+mOMACmZe7o0uWeE+H0OGTHtg4QKg4JnUCRKtrmmnXwiF8ex1EQJCcElrPJ0XRIA g3EeBrAac2I/GsU+FOlJrbL3EdJpC4Y0WTBdEyYw56rUXm1xd4HvrDIiBz+59oC82Zpu hf1ZwNSPXAtTaztEeIr5pG9hjL82lp4z9eaEiBKPmGN932jxq/eKxszBccnm1PD0RrQ6 OTFyLkS7d6iFgWGh4vA/pYIponGIcABoy04H8ABMGhQV5wyc93hR3uqwD/WRUSSX6bp/ e2lw== X-Received: by 10.55.52.129 with SMTP id b123mr24635425qka.94.1427984249055; Thu, 02 Apr 2015 07:17:29 -0700 (PDT) Received: from jasmin.localdomain (189-19-118-208.dsl.telesp.net.br. [189.19.118.208]) by mx.google.com with ESMTPSA id 13sm3541619qku.20.2015.04.02.07.17.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 07:17:28 -0700 (PDT) From: Gustavo Padovan To: linux-samsung-soc@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, inki.dae@samsung.com, jy0922.shim@samsung.com, Gustavo Padovan Subject: [PATCH -v2 06/10] drm/exynos: atomic phase 3: atomic updates of planes Date: Thu, 2 Apr 2015 11:17:08 -0300 Message-Id: <1427984231-7007-7-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427984231-7007-1-git-send-email-gustavo@padovan.org> References: <1427984231-7007-1-git-send-email-gustavo@padovan.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Now that phase 1 and 2 are complete we can switch the update/disable_plane callbacks to their atomic version. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/exynos/exynos_drm_fb.c | 3 +++ drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c index 470456d..b83ceea 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "exynos_drm_drv.h" @@ -309,6 +310,8 @@ static void exynos_drm_output_poll_changed(struct drm_device *dev) static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = { .fb_create = exynos_user_fb_create, .output_poll_changed = exynos_drm_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, }; void exynos_drm_mode_config_init(struct drm_device *dev) diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 3cd628e..e83908a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -160,8 +160,8 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, } static struct drm_plane_funcs exynos_plane_funcs = { - .update_plane = drm_plane_helper_update, - .disable_plane = drm_plane_helper_disable, + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, .destroy = drm_plane_cleanup, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,