From patchwork Mon Nov 27 10:09:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 841582 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R++ODGaN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yljGM24MQz9s7F for ; Mon, 27 Nov 2017 21:10:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751654AbdK0KKC (ORCPT ); Mon, 27 Nov 2017 05:10:02 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:43058 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbdK0KJ6 (ORCPT ); Mon, 27 Nov 2017 05:09:58 -0500 Received: by mail-wm0-f67.google.com with SMTP id x63so32828125wmf.2 for ; Mon, 27 Nov 2017 02:09:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Cn4cMaaYjca2nTbvnZ3rOn/v1d5md9jj1wfYf/J6654=; b=R++ODGaN1bpYjdScpOSRxz151TV1EhbZzyF3MIpdM8tJuaO9MNaj0y5yb2/8TIGDKp 1DeO0hFs6xkGzUj0WoqI2ZCM+89IeNZyjhEE0uhlTZDfc2AuenWmvqYNOlcITFJZ728a v7uqL1az1bw9lmo/HN3NLf/IciQ3D/Btr/8OBaaXk0FpWtauNnW/FIKwyvC+4sZuw99l IwcY0GX+99asvIkInaddaFQVFy38LGC/RMjHTMT82KujbA9ogGQIDa+cEZCaCr2ZJ601 TaQ7kxID0KTlsyfTmZ/rN1z4RRWJ/PR0YeqoG5qp3FpnS8K83QrDM2MaWw+4beSX5Quk QIyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Cn4cMaaYjca2nTbvnZ3rOn/v1d5md9jj1wfYf/J6654=; b=S7dz/LJE5mBV3BnKxhweosdvyO6DeBMe2f4FhNjJ65Ij/jWKr4GUrz9FMS50SmJTpf PXZ7wrz50kZIztAOBKSPgoQb4U2S2/fM5raJvbQNoZopbCFc8YDU/QMqzu3gm/YojlFl ORcRVDbvNqElYbbPbDoGA4NjKxqduaKveLJNhNFm/zMD0Dorm+wfYBObIPPtF+j72rMl aqniFjTwUKwhlZju6bqM2WecC/GJvFvI01VVsb0F52yaNEcaFrr+pnfTexwXkojJFQkj 8rGtCXsTvxFHgXwpl5dURX4fIYZe6lECGDCSYXbFozbdj0nUsDb1tcyd30OlNmxvhZMj z9tw== X-Gm-Message-State: AJaThX6+Xrr7MtpxQdoCPux3sLJ7el9mGQr9EN7rXTDMlM3YFNqwBOlu 0nN2x7sqSqIhZN71UAyiwu0dOw== X-Google-Smtp-Source: AGs4zMZhXsq1gisF/g1FcW9eTyViEfNe6Rj5ZBfLsQPCliKQJGEp4A4w5FtKFIFwyDDlDZSB2lexbQ== X-Received: by 10.28.54.204 with SMTP id y73mr5203361wmh.15.1511777397273; Mon, 27 Nov 2017 02:09:57 -0800 (PST) Received: from localhost (p200300E41F200F003F65F430A8AE2E44.dip0.t-ipconnect.de. [2003:e4:1f20:f00:3f65:f430:a8ae:2e44]) by smtp.gmail.com with ESMTPSA id t200sm14153077wmd.45.2017.11.27.02.09.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Nov 2017 02:09:56 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 02/12] drm/tegra: dc: Remove duplicate plane funcs Date: Mon, 27 Nov 2017 11:09:42 +0100 Message-Id: <20171127100952.22465-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171127100952.22465-1-thierry.reding@gmail.com> References: <20171127100952.22465-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Both tegra_primary_plane_funcs and tegra_cursor_plane_funcs are identical. Get rid of the duplicate and use one set of function pointers for all planes. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/dc.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 552710f5c386..2b7ece1d0c18 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -458,7 +458,7 @@ static void tegra_plane_atomic_destroy_state(struct drm_plane *plane, kfree(state); } -static const struct drm_plane_funcs tegra_primary_plane_funcs = { +static const struct drm_plane_funcs tegra_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = tegra_plane_destroy, @@ -673,7 +673,7 @@ static struct drm_plane *tegra_dc_primary_plane_create(struct drm_device *drm, formats = tegra_primary_plane_formats; err = drm_universal_plane_init(drm, &plane->base, possible_crtcs, - &tegra_primary_plane_funcs, formats, + &tegra_plane_funcs, formats, num_formats, NULL, DRM_PLANE_TYPE_PRIMARY, NULL); if (err < 0) { @@ -799,15 +799,6 @@ static void tegra_cursor_atomic_disable(struct drm_plane *plane, tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS); } -static const struct drm_plane_funcs tegra_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = tegra_plane_destroy, - .reset = tegra_plane_reset, - .atomic_duplicate_state = tegra_plane_atomic_duplicate_state, - .atomic_destroy_state = tegra_plane_atomic_destroy_state, -}; - static const struct drm_plane_helper_funcs tegra_cursor_plane_helper_funcs = { .atomic_check = tegra_cursor_atomic_check, .atomic_update = tegra_cursor_atomic_update, @@ -840,7 +831,7 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm, formats = tegra_cursor_plane_formats; err = drm_universal_plane_init(drm, &plane->base, 1 << dc->pipe, - &tegra_cursor_plane_funcs, formats, + &tegra_plane_funcs, formats, num_formats, NULL, DRM_PLANE_TYPE_CURSOR, NULL); if (err < 0) {