From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
linux-samsung-soc@vger.kernel.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
dri-devel@lists.freedesktop.org,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: [PATCH v2 12/12] drm/exynos: kill mode_set_nofb callback
Date: Wed, 08 Mar 2017 15:58:46 +0100 [thread overview]
Message-ID: <1488985126-25288-13-git-send-email-a.hajda@samsung.com> (raw)
In-Reply-To: <1488985126-25288-1-git-send-email-a.hajda@samsung.com>
All Exynos CRTCs are fully configured by .enable callback. The only users
of mode_set_nofb actually did nothing in their callbacks - they immediately
returned because devices were in suspend state - mode_set_nofb is always
called on disabled device.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 -
drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ----------
drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 --
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 -
4 files changed, 14 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 1ffb0b1..3e88269 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -581,7 +581,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc)
static const struct exynos_drm_crtc_ops decon_crtc_ops = {
.enable = decon_enable,
.disable = decon_disable,
- .commit = decon_commit,
.enable_vblank = decon_enable_vblank,
.disable_vblank = decon_disable_vblank,
.atomic_begin = decon_atomic_begin,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 2d0aa11..d72777f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -49,15 +49,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
}
}
-static void
-exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
-{
- struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
-
- if (exynos_crtc->ops->commit)
- exynos_crtc->ops->commit(exynos_crtc);
-}
-
static int exynos_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_crtc_state *state)
{
@@ -93,7 +84,6 @@ static void exynos_crtc_atomic_flush(struct drm_crtc *crtc,
static const struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
.enable = exynos_drm_crtc_enable,
.disable = exynos_drm_crtc_disable,
- .mode_set_nofb = exynos_drm_crtc_mode_set_nofb,
.atomic_check = exynos_crtc_atomic_check,
.atomic_begin = exynos_crtc_atomic_begin,
.atomic_flush = exynos_crtc_atomic_flush,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 7ef2b36..527bf1d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -115,7 +115,6 @@ struct exynos_drm_plane_config {
*
* @enable: enable the device
* @disable: disable the device
- * @commit: set current hw specific display mode to hw.
* @enable_vblank: specific driver callback for enabling vblank interrupt.
* @disable_vblank: specific driver callback for disabling vblank interrupt.
* @atomic_check: validate state
@@ -130,7 +129,6 @@ struct exynos_drm_crtc;
struct exynos_drm_crtc_ops {
void (*enable)(struct exynos_drm_crtc *crtc);
void (*disable)(struct exynos_drm_crtc *crtc);
- void (*commit)(struct exynos_drm_crtc *crtc);
int (*enable_vblank)(struct exynos_drm_crtc *crtc);
void (*disable_vblank)(struct exynos_drm_crtc *crtc);
u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 0b74e57..bf5135c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -942,7 +942,6 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable)
static const struct exynos_drm_crtc_ops fimd_crtc_ops = {
.enable = fimd_enable,
.disable = fimd_disable,
- .commit = fimd_commit,
.enable_vblank = fimd_enable_vblank,
.disable_vblank = fimd_disable_vblank,
.atomic_begin = fimd_atomic_begin,
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-03-08 14:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170308145900eucas1p25d1fd7a33ad2bb9fa8c911a3b923546b@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 00/12] drm/exynos: rework vblank handling Andrzej Hajda
[not found] ` <CGME20170308145901eucas1p21056f416d8a34fc5af4a4b89ed48ad5a@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 01/12] drm/exynos: move crtc event handling to drivers callbacks Andrzej Hajda
[not found] ` <CGME20170308145901eucas1p2e7695c1d9fa43378d0a298b029d11269@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 02/12] drm/exynos: simplify completion event handling Andrzej Hajda
[not found] ` <CGME20170308145902eucas1p24636df9b8eafd2b07f12a2c700c6bcea@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 03/12] drm/exynos/decon5433: fix vblank " Andrzej Hajda
2017-03-09 3:54 ` Michel Dänzer
2017-03-09 6:54 ` Andrzej Hajda
2017-03-13 6:33 ` Inki Dae
[not found] ` <CGME20170313073211eucas1p17a7cdf647b711343ef382adb792ed84e@eucas1p1.samsung.com>
2017-03-13 7:31 ` [PATCH v3 " Andrzej Hajda
[not found] ` <CGME20170308145902eucas1p131a3e6700da4e72c6d4ca1a4f74e5893@eucas1p1.samsung.com>
2017-03-08 14:58 ` [PATCH v2 04/12] drm/exynos/decon5433: implement frame counter Andrzej Hajda
[not found] ` <CGME20170308145902eucas1p2ef76c359292764dfe2a04312a1ee8dfb@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 05/12] drm/exynos/decon5433: signal frame done interrupt at front porch Andrzej Hajda
[not found] ` <CGME20170308145903eucas1p27b43f06a1c172d33d7143df9f10ce1b0@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 06/12] drm/exynos/fimd: " Andrzej Hajda
[not found] ` <CGME20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 07/12] drm/exynos/decon5433: fix software trigger mask Andrzej Hajda
[not found] ` <CGME20170308145904eucas1p2cf66bf512f2fed9961dff807e3b2af0f@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 08/12] drm/exynos: kill exynos_drm_crtc::pipe Andrzej Hajda
[not found] ` <CGME20170308145905eucas1p10b5d39a4c72461a9fa3a33da8d3e3b00@eucas1p1.samsung.com>
2017-03-08 14:58 ` [PATCH v2 09/12] drm/exynos: kill exynos_drm_private::pipe Andrzej Hajda
[not found] ` <CGME20170308145905eucas1p2b562042b430d53f74fc5bdd3097ef21d@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 10/12] drm/exynos: set plane possible_crtcs in exynos_plane_init Andrzej Hajda
[not found] ` <CGME20170308145906eucas1p24caed8fd5f3eda8c4e1ece3c2a8a6091@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 11/12] drm/exynos: kill pipe field from drivers contexts Andrzej Hajda
[not found] ` <CGME20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e@eucas1p2.samsung.com>
2017-03-08 14:58 ` Andrzej Hajda [this message]
2017-03-14 1:28 ` [PATCH v2 00/12] drm/exynos: rework vblank handling Inki Dae
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=1488985126-25288-13-git-send-email-a.hajda@samsung.com \
--to=a.hajda@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=javier@osg.samsung.com \
--cc=krzk@kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).