All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>,
	Alexey Brodkin <abrodkin@synopsys.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>,
	tiantao6@hisilicon.com,
	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Subject: [PATCH 08/15] drm/arc: Align with simple pipe helpers
Date: Tue, 12 Jan 2021 09:43:51 +0100	[thread overview]
Message-ID: <20210112084358.2771527-8-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20210112084358.2771527-1-daniel.vetter@ffwll.ch>

Simple pipe helpers only have an enable and disable hook, no more
mode_set_nofb. Call it from our enable hook to align with that
conversions.

Atomic helpers always call mode_set_nofb and enable together, so
there's no functional change here.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
---
 drivers/gpu/drm/arc/arcpgu_crtc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
index 43313adb1981..3538c1686ca4 100644
--- a/drivers/gpu/drm/arc/arcpgu_crtc.c
+++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
@@ -73,10 +73,9 @@ static enum drm_mode_status arc_pgu_crtc_mode_valid(struct drm_crtc *crtc,
 	return MODE_NOCLOCK;
 }
 
-static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu)
 {
-	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
-	struct drm_display_mode *m = &crtc->state->adjusted_mode;
+	struct drm_display_mode *m = &arcpgu->pipe.crtc.state->adjusted_mode;
 	u32 val;
 
 	arc_pgu_write(arcpgu, ARCPGU_REG_FMT,
@@ -110,7 +109,7 @@ static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc)
 	arc_pgu_write(arcpgu, ARCPGU_REG_STRIDE, 0);
 	arc_pgu_write(arcpgu, ARCPGU_REG_START_SET, 1);
 
-	arc_pgu_set_pxl_fmt(crtc);
+	arc_pgu_set_pxl_fmt(&arcpgu->pipe.crtc);
 
 	clk_set_rate(arcpgu->clk, m->crtc_clock * 1000);
 }
@@ -120,6 +119,8 @@ static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc,
 {
 	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
 
+	arc_pgu_mode_set(arcpgu);
+
 	clk_prepare_enable(arcpgu->clk);
 	arc_pgu_write(arcpgu, ARCPGU_REG_CTRL,
 		      arc_pgu_read(arcpgu, ARCPGU_REG_CTRL) |
@@ -139,7 +140,6 @@ static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc,
 
 static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {
 	.mode_valid	= arc_pgu_crtc_mode_valid,
-	.mode_set_nofb	= arc_pgu_crtc_mode_set_nofb,
 	.atomic_enable	= arc_pgu_crtc_atomic_enable,
 	.atomic_disable	= arc_pgu_crtc_atomic_disable,
 };
-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2021-01-12  8:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-12  8:43 [PATCH 01/15] drm/arc: Switch to devm_drm_dev_alloc Daniel Vetter
2021-01-12  8:43 ` [PATCH 02/15] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2021-01-12  8:43 ` [PATCH 03/15] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2021-01-12  8:43 ` [PATCH 04/15] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2021-01-12  8:43 ` [PATCH 05/15] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2021-01-12  8:43 ` [PATCH 06/15] drm/arc: Drop surplus connector registration Daniel Vetter
2021-01-12  8:43 ` [PATCH 07/15] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2021-01-12 11:29   ` Thomas Zimmermann
2021-02-25 11:16     ` Daniel Vetter
2021-01-12  8:43 ` Daniel Vetter [this message]
2021-01-12  8:43 ` [PATCH 09/15] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2021-01-12  8:43 ` [PATCH 10/15] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2021-01-12  8:43 ` [PATCH 11/15] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2021-01-12  8:43 ` [PATCH 12/15] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2021-01-12  8:43 ` [PATCH 13/15] drm/arc: Inline remaining files Daniel Vetter
2021-01-12  8:43 ` [PATCH 14/15] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2021-01-12  8:43 ` [PATCH 15/15] drm/arc: Move to drm/tiny Daniel Vetter
2021-01-12 11:42 ` [PATCH 01/15] drm/arc: Switch to devm_drm_dev_alloc Thomas Zimmermann
2021-02-25 12:19   ` Daniel Vetter

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=20210112084358.2771527-8-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=Eugeniy.Paltsev@synopsys.com \
    --cc=abrodkin@synopsys.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=sam@ravnborg.org \
    --cc=tiantao6@hisilicon.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 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.