From patchwork Wed Dec 13 15:33:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 121791 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5621265qgn; Wed, 13 Dec 2017 07:34:17 -0800 (PST) X-Google-Smtp-Source: ACJfBouO/wUutqDaOguRmk24snhMYtwcvKJqj2zpKdtQuB6DL34WSaMLFbJXDqygBJBoeA92QvEH X-Received: by 10.84.129.46 with SMTP id 43mr6436637plb.1.1513179256978; Wed, 13 Dec 2017 07:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513179256; cv=none; d=google.com; s=arc-20160816; b=gFZ/1WXllrc14Zyg+rP4ewGDBD94/yynU2np9ZUm6tBma9d7+LSv3mTahbVaZsahsi w/EBUdISO4eLGo2uTUvZNK806cI2bo75kFNGKX9SjzhrCFBZ73X6uuQKvuz5h5WE+4A9 TPpm4TbUm2WvbFTFuVdt/qV8NmyoVAYtS272TX+fzcL6UN4iQrCjGumHMDbJbzFn9BYM TK0KhjW3pWBf26A1LOUPpX17xyvQD1N8HQEUwnCMFL8az7pOrTbjctB7httMsVIOBKfc zfNxcP70EmEMgtNO4TkHzYnFaxKHU3pjcjT1R9Qedc94kD/1dhpVAPplFVwvl42B9s+x aFEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=tlSqlsQDjaKi2ts7Jjc3VUAzcGodlh1KARXfp9BvP8o=; b=el6U/Ni7DDHHfq07UJwzylZ+oYzRNB52di+38DlkqgmHQtzDoxW0aiiMmYpEEGT6ZI mbPnFGIA/dHsmyD/R/61hA0yyaOZXjkOLXekQA5hH8f4d3cUnsf1EqPt63k2dxpT8cSZ c1PfmIeMRFyCYDOOV9Z9YRGCwlKYQ1vdWXqbF/X40I592BZZDOrGxQ3juXhTrKV+mY8u kLeoVsjD61v7nGl4XIE8ciE+6A5yUs1F9MYe5xxKvbT3Ztg611nnDAzzG4iztOB8Frg9 dzVfXm+LsYWwQD4R4GhoTDWZ6/JgvLkUACfVpz6wpOQkeOGT3/6l3Mpl1Vq2DzdSr1JR zn1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id r10si1433843pgp.66.2017.12.13.07.34.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 07:34:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B56EE6E51D; Wed, 13 Dec 2017 15:33:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 00D936E50D for ; Wed, 13 Dec 2017 15:33:40 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id C1F882092C; Wed, 13 Dec 2017 16:33:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9BBB120503; Wed, 13 Dec 2017 16:33:38 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 3/8] drm/sun4i: sun4i_layer: Add a custom plane state Date: Wed, 13 Dec 2017 16:33:27 +0100 Message-Id: <8ecbf0bda89d11539dbf9357f0fe77561ebdd4c3.1513178989.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, thomas@vitsch.nl X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We will need to store some additional data in the future to the state. Create a custom plane state that will embed those data, in order to store the pipe or whether or not that plane should use the frontend. Signed-off-by: Maxime Ripard Reviewed-by: Neil Armstrong --- drivers/gpu/drm/sun4i/sun4i_layer.c | 48 ++++++++++++++++++++++++++++-- drivers/gpu/drm/sun4i/sun4i_layer.h | 10 ++++++- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c index 7bddf12548d3..c3afcf888906 100644 --- a/drivers/gpu/drm/sun4i/sun4i_layer.c +++ b/drivers/gpu/drm/sun4i/sun4i_layer.c @@ -25,6 +25,48 @@ struct sun4i_plane_desc { uint32_t nformats; }; +static void sun4i_backend_layer_reset(struct drm_plane *plane) +{ + struct sun4i_layer_state *state; + + if (plane->state) { + state = state_to_sun4i_layer_state(plane->state); + + __drm_atomic_helper_plane_destroy_state(&state->state); + kfree(state); + plane->state = NULL; + } + + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (state) { + plane->state = &state->state; + plane->state->plane = plane; + } +} + +static struct drm_plane_state * +sun4i_backend_layer_duplicate_state(struct drm_plane *plane) +{ + struct sun4i_layer_state *copy; + + copy = kzalloc(sizeof(*copy), GFP_KERNEL); + if (!copy) + return NULL; + + __drm_atomic_helper_plane_duplicate_state(plane, ©->state); + + return ©->state; +} + +static void sun4i_backend_layer_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state) +{ + struct sun4i_layer_state *s_state = state_to_sun4i_layer_state(state); + + __drm_atomic_helper_plane_destroy_state(state); + kfree(s_state); +} + static void sun4i_backend_layer_atomic_disable(struct drm_plane *plane, struct drm_plane_state *old_state) { @@ -52,11 +94,11 @@ static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = { }; static const struct drm_plane_funcs sun4i_backend_layer_funcs = { - .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, - .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = sun4i_backend_layer_destroy_state, + .atomic_duplicate_state = sun4i_backend_layer_duplicate_state, .destroy = drm_plane_cleanup, .disable_plane = drm_atomic_helper_disable_plane, - .reset = drm_atomic_helper_plane_reset, + .reset = sun4i_backend_layer_reset, .update_plane = drm_atomic_helper_update_plane, }; diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.h b/drivers/gpu/drm/sun4i/sun4i_layer.h index 4e84f438b346..d2c19348d1b0 100644 --- a/drivers/gpu/drm/sun4i/sun4i_layer.h +++ b/drivers/gpu/drm/sun4i/sun4i_layer.h @@ -22,12 +22,22 @@ struct sun4i_layer { int id; }; +struct sun4i_layer_state { + struct drm_plane_state state; +}; + static inline struct sun4i_layer * plane_to_sun4i_layer(struct drm_plane *plane) { return container_of(plane, struct sun4i_layer, plane); } +static inline struct sun4i_layer_state * +state_to_sun4i_layer_state(struct drm_plane_state *state) +{ + return container_of(state, struct sun4i_layer_state, state); +} + struct drm_plane **sun4i_layers_init(struct drm_device *drm, struct sunxi_engine *engine);