mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Keeping <john@metanate.com>
To: Mark Yao <mark.yao@rock-chips.com>
Cc: Chris Zhong <zyw@rock-chips.com>,
	dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
	Sean Paul <seanpaul@chromium.org>,
	John Keeping <john@metanate.com>
Subject: [PATCH v4 03/23] drm/rockchip: dw-mipi-dsi: remove mode_set hook
Date: Fri, 24 Feb 2017 12:54:46 +0000	[thread overview]
Message-ID: <20170224125506.21533-4-john@metanate.com> (raw)
In-Reply-To: <20170224125506.21533-1-john@metanate.com>

This is not needed since we can access the mode via the CRTC from the
enable hook.  Also remove the "mode" field that is no longer used.

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: Chris Zhong <zyw@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
---
v4:
- Add Sean's Reviewed-by
v3:
- Add Chris' Reviewed-by
New in v2
---
 drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index cdbd25087e83..bd92e58b64f3 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -286,7 +286,6 @@ struct dw_mipi_dsi {
 	u32 format;
 	u16 input_div;
 	u16 feedback_div;
-	struct drm_display_mode *mode;
 
 	const struct dw_mipi_dsi_plat_data *pdata;
 };
@@ -816,15 +815,6 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi)
 	dsi_write(dsi, DSI_INT_MSK1, 0);
 }
 
-static void dw_mipi_dsi_encoder_mode_set(struct drm_encoder *encoder,
-					struct drm_display_mode *mode,
-					struct drm_display_mode *adjusted_mode)
-{
-	struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);
-
-	dsi->mode = adjusted_mode;
-}
-
 static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder)
 {
 	struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);
@@ -854,7 +844,7 @@ static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder)
 static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)
 {
 	struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);
-	struct drm_display_mode *mode = dsi->mode;
+	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
 	int mux = drm_of_encoder_active_endpoint_id(dsi->dev->of_node, encoder);
 	u32 val;
 	int ret;
@@ -930,7 +920,6 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder,
 static struct drm_encoder_helper_funcs
 dw_mipi_dsi_encoder_helper_funcs = {
 	.enable = dw_mipi_dsi_encoder_enable,
-	.mode_set = dw_mipi_dsi_encoder_mode_set,
 	.disable = dw_mipi_dsi_encoder_disable,
 	.atomic_check = dw_mipi_dsi_encoder_atomic_check,
 };
-- 
2.12.0.rc0.230.gf625d4cdb9.dirty

  parent reply	other threads:[~2017-02-24 12:57 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-24 12:54 [PATCH v4 00/23] drm/rockchip: MIPI fixes & improvements John Keeping
2017-02-24 12:54 ` [PATCH v4 01/23] drm/rockchip: dw-mipi-dsi: don't configure hardware in mode_set for MIPI John Keeping
2017-02-24 12:54 ` [PATCH v4 02/23] drm/rockchip: dw-mipi-dsi: pass mode in where needed John Keeping
2017-02-24 12:54 ` John Keeping [this message]
2017-02-24 12:54 ` [PATCH v4 04/23] drm/rockchip: dw-mipi-dsi: fix command header writes John Keeping
2017-02-24 12:54 ` [PATCH v4 05/23] drm/rockchip: dw-mipi-dsi: fix generic packet status check John Keeping
2017-02-24 12:54 ` [PATCH v4 06/23] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf John Keeping
2017-02-24 12:54 ` [PATCH v4 07/23] drm/rockchip: dw-mipi-dsi: include bad value in error message John Keeping
2017-02-24 12:54 ` [PATCH v4 08/23] drm/rockchip: dw-mipi-dsi: respect message flags John Keeping
2017-02-24 12:54 ` [PATCH v4 09/23] drm/rockchip: dw-mipi-dsi: only request HS clock when required John Keeping
2017-02-24 12:54 ` [PATCH v4 10/23] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned John Keeping
2017-02-24 12:54 ` [PATCH v4 11/23] drm/rockchip: dw-mipi-dsi: prepare panel after phy init John Keeping
2017-02-24 12:54 ` [PATCH v4 12/23] drm/rockchip: dw-mipi-dsi: allow commands in panel_disable John Keeping
2017-02-24 12:54 ` [PATCH v4 13/23] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping
2017-02-24 12:54 ` [PATCH v4 14/23] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping
2017-02-24 12:54 ` [PATCH v4 15/23] drm/rockchip: dw-mipi-dsi: configure PHY before enabling John Keeping
2017-02-24 12:54 ` [PATCH v4 16/23] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping
2017-02-24 12:55 ` [PATCH v4 17/23] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping
2017-02-24 12:55 ` [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping
2017-02-24 12:55 ` [PATCH v4 19/23] drm/rockchip: dw-mipi-dsi: use positive check for N{H,V}SYNC John Keeping
2017-02-24 12:55 ` [PATCH v4 20/23] drm/rockchip: vop: test for P{H,V}SYNC John Keeping
2017-02-24 12:55 ` [PATCH v4 21/23] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping
2017-02-24 12:55 ` [PATCH v4 22/23] drm/rockchip: dw-mipi-dsi: support non-burst modes John Keeping
2017-02-24 12:55 ` [PATCH v4 23/23] drm/rockchip: dw-mipi-dsi: add reset control John Keeping
2017-03-02 21:56   ` Brian Norris
2017-03-03 11:39     ` [PATCH] dt-bindings: display: rk3288-mipi-dsi: add reset property John Keeping
2017-03-03 20:41       ` Brian Norris
2017-03-06 16:52       ` Sean Paul
2017-03-12 12:06       ` Rob Herring
2017-04-04 13:15         ` John Keeping
2017-04-04 18:30           ` Sean Paul
2017-03-02 21:59   ` [PATCH v4 23/23] drm/rockchip: dw-mipi-dsi: add reset control Brian Norris
2017-02-27  1:41 ` [PATCH v4 00/23] drm/rockchip: MIPI fixes & improvements Mark yao
2017-02-27  3:34 ` Chris Zhong
2017-03-01 20:03 ` Sean Paul

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=20170224125506.21533-4-john@metanate.com \
    --to=john@metanate.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.yao@rock-chips.com \
    --cc=seanpaul@chromium.org \
    --cc=zyw@rock-chips.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

all inboxes | Powered by JetHome®