From: Maxime Ripard <maxime.ripard@free-electrons.com> To: Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie>, Jani Nikula <jani.nikula@linux.intel.com>, Sean Paul <seanpaul@chromium.org>, Inki Dae <inki.dae@samsung.com>, Joonyoung Shim <jy0922.shim@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mark Yao <mark.yao@rock-chips.com>, Heiko Stuebner <heiko@sntech.de>, Chen-Yu Tsai <wens@csie.org>, Maxime Ripard <maxime.ripard@free-electrons.com> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2 3/4] drm/sun4i: engine: Add commit_poll function Date: Thu, 20 Jul 2017 15:01:18 +0200 [thread overview] Message-ID: <d491c6e69f269959915d6ba88ab80f5573021fee.1500555652.git-series.maxime.ripard@free-electrons.com> (raw) In-Reply-To: <cover.204b8c1b76558ee33ecf147e51c2b6a04d302d55.1500555652.git-series.maxime.ripard@free-electrons.com> In-Reply-To: <cover.204b8c1b76558ee33ecf147e51c2b6a04d302d55.1500555652.git-series.maxime.ripard@free-electrons.com> On the earlier Allwinner chips, with the first iteration of the display engine, the backend commit bit needs to be polled before making any register access to the backend. Add an operation for that, that will be called in atomic_begin in order to be sure to have that bit cleared before we do any modifications. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 ++ drivers/gpu/drm/sun4i/sunxi_engine.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index f8c70439d1e2..2eba1d8639d8 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -45,6 +45,8 @@ static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc, spin_unlock_irqrestore(&dev->event_lock, flags); crtc->state->event = NULL; } + + WARN_ON(sunxi_engine_commit_poll(engine)); } static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/sun4i/sunxi_engine.h b/drivers/gpu/drm/sun4i/sunxi_engine.h index 4cb70ae65c79..6618e182613c 100644 --- a/drivers/gpu/drm/sun4i/sunxi_engine.h +++ b/drivers/gpu/drm/sun4i/sunxi_engine.h @@ -17,6 +17,7 @@ struct sunxi_engine; struct sunxi_engine_ops { void (*commit)(struct sunxi_engine *engine); + int (*commit_poll)(struct sunxi_engine *engine); struct drm_plane **(*layers_init)(struct drm_device *drm, struct sunxi_engine *engine); @@ -55,6 +56,19 @@ sunxi_engine_commit(struct sunxi_engine *engine) } /** + * sunxi_engine_commit_poll() - wait for all changes to be committed + * @engine: pointer to the engine + */ +static inline int +sunxi_engine_commit_poll(struct sunxi_engine *engine) +{ + if (engine->ops && engine->ops->commit_poll) + return engine->ops->commit_poll(engine); + + return 0; +} + +/** * sunxi_engine_layers_init() - Create planes (layers) for the engine * @drm: pointer to the drm_device for which planes will be created * @engine: pointer to the engine -- git-series 0.9.1
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/4] drm/sun4i: engine: Add commit_poll function Date: Thu, 20 Jul 2017 15:01:18 +0200 [thread overview] Message-ID: <d491c6e69f269959915d6ba88ab80f5573021fee.1500555652.git-series.maxime.ripard@free-electrons.com> (raw) In-Reply-To: <cover.204b8c1b76558ee33ecf147e51c2b6a04d302d55.1500555652.git-series.maxime.ripard@free-electrons.com> On the earlier Allwinner chips, with the first iteration of the display engine, the backend commit bit needs to be polled before making any register access to the backend. Add an operation for that, that will be called in atomic_begin in order to be sure to have that bit cleared before we do any modifications. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 ++ drivers/gpu/drm/sun4i/sunxi_engine.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index f8c70439d1e2..2eba1d8639d8 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -45,6 +45,8 @@ static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc, spin_unlock_irqrestore(&dev->event_lock, flags); crtc->state->event = NULL; } + + WARN_ON(sunxi_engine_commit_poll(engine)); } static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/sun4i/sunxi_engine.h b/drivers/gpu/drm/sun4i/sunxi_engine.h index 4cb70ae65c79..6618e182613c 100644 --- a/drivers/gpu/drm/sun4i/sunxi_engine.h +++ b/drivers/gpu/drm/sun4i/sunxi_engine.h @@ -17,6 +17,7 @@ struct sunxi_engine; struct sunxi_engine_ops { void (*commit)(struct sunxi_engine *engine); + int (*commit_poll)(struct sunxi_engine *engine); struct drm_plane **(*layers_init)(struct drm_device *drm, struct sunxi_engine *engine); @@ -55,6 +56,19 @@ sunxi_engine_commit(struct sunxi_engine *engine) } /** + * sunxi_engine_commit_poll() - wait for all changes to be committed + * @engine: pointer to the engine + */ +static inline int +sunxi_engine_commit_poll(struct sunxi_engine *engine) +{ + if (engine->ops && engine->ops->commit_poll) + return engine->ops->commit_poll(engine); + + return 0; +} + +/** * sunxi_engine_layers_init() - Create planes (layers) for the engine * @drm: pointer to the drm_device for which planes will be created * @engine: pointer to the engine -- git-series 0.9.1
next prev parent reply other threads:[~2017-07-20 13:01 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-20 13:01 [PATCH v2 0/4] drm/sun4i: Fix a register access bug Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` [PATCH v2 1/4] drm/atomic: implement drm_atomic_helper_commit_tail for runtime_pm users Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 18:46 ` Daniel Vetter 2017-07-20 18:46 ` Daniel Vetter 2017-07-20 18:46 ` Daniel Vetter 2017-07-25 6:57 ` Maxime Ripard 2017-07-25 6:57 ` Maxime Ripard 2017-07-25 8:09 ` Daniel Vetter 2017-07-25 8:09 ` Daniel Vetter 2017-07-25 8:09 ` Daniel Vetter 2017-08-02 11:20 ` Liviu Dudau 2017-08-02 11:20 ` Liviu Dudau 2017-08-02 11:27 ` Daniel Vetter 2017-08-02 11:27 ` Daniel Vetter 2017-08-02 11:27 ` Daniel Vetter 2017-08-02 12:46 ` Liviu Dudau 2017-08-02 12:46 ` Liviu Dudau 2017-08-02 12:46 ` Liviu Dudau 2017-08-02 13:27 ` Laurent Pinchart 2017-08-02 13:27 ` Laurent Pinchart 2017-08-02 13:27 ` Laurent Pinchart 2017-08-02 13:32 ` Liviu Dudau 2017-08-02 13:32 ` Liviu Dudau 2017-08-02 13:32 ` Liviu Dudau 2017-08-02 13:49 ` Laurent Pinchart 2017-08-02 13:49 ` Laurent Pinchart 2017-08-02 13:49 ` Laurent Pinchart 2017-08-02 13:57 ` Liviu Dudau 2017-08-02 13:57 ` Liviu Dudau 2017-08-02 13:57 ` Liviu Dudau 2017-08-02 14:20 ` Laurent Pinchart 2017-08-02 14:20 ` Laurent Pinchart 2017-08-02 14:20 ` Laurent Pinchart 2017-08-02 14:28 ` Daniel Vetter 2017-08-02 14:28 ` Daniel Vetter 2017-08-02 14:28 ` Daniel Vetter 2017-07-20 13:01 ` [PATCH v2 2/4] drm/sun4i: Use the runtime_pm commit_tail variant Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard [this message] 2017-07-20 13:01 ` [PATCH v2 3/4] drm/sun4i: engine: Add commit_poll function Maxime Ripard 2017-07-20 13:01 ` [PATCH v2 4/4] drm/sun4i: make sure we don't have a commit pending Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard 2017-07-20 13:01 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d491c6e69f269959915d6ba88ab80f5573021fee.1500555652.git-series.maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=heiko@sntech.de \ --cc=inki.dae@samsung.com \ --cc=jani.nikula@linux.intel.com \ --cc=jy0922.shim@samsung.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=kyungmin.park@samsung.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=mark.yao@rock-chips.com \ --cc=seanpaul@chromium.org \ --cc=sw0312.kim@samsung.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.