From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Aradhya Bhatia <a-bhatia1@ti.com>,
Devarsh Thakkar <devarsht@ti.com>, Jyri Sarha <jyri.sarha@iki.fi>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Francesco Dolcini <francesco@dolcini.it>,
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: [PATCH v2 06/11] drm/tidss: Check for K2G in in dispc_softreset()
Date: Thu, 09 Nov 2023 09:37:59 +0200 [thread overview]
Message-ID: <20231109-tidss-probe-v2-6-ac91b5ea35c0@ideasonboard.com> (raw)
In-Reply-To: <20231109-tidss-probe-v2-0-ac91b5ea35c0@ideasonboard.com>
K2G doesn't have softreset feature. Instead of having every caller of
dispc_softreset() check for K2G, move the check into dispc_softreset(),
and make dispc_softreset() return 0 in case of K2G.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
drivers/gpu/drm/tidss/tidss_dispc.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index 50b475b285d9..c82fd5bc9be4 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2707,6 +2707,10 @@ static int dispc_softreset(struct dispc_device *dispc)
u32 val;
int ret;
+ /* K2G display controller does not support soft reset */
+ if (dispc->feat->subrev == DISPC_K2G)
+ return 0;
+
/* Soft reset */
REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);
/* Wait for reset to complete */
@@ -2829,12 +2833,9 @@ int dispc_init(struct tidss_device *tidss)
of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth",
&dispc->memory_bandwidth_limit);
- /* K2G display controller does not support soft reset */
- if (feat->subrev != DISPC_K2G) {
- r = dispc_softreset(dispc);
- if (r)
- return r;
- }
+ r = dispc_softreset(dispc);
+ if (r)
+ return r;
tidss->dispc = dispc;
--
2.34.1
next prev parent reply other threads:[~2023-11-09 7:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
2023-11-09 7:37 ` [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get() Tomi Valkeinen
2023-11-09 7:37 ` [PATCH v2 02/11] drm/tidss: Use PM autosuspend Tomi Valkeinen
2023-11-09 7:37 ` [PATCH v2 03/11] drm/tidss: Drop useless variable init Tomi Valkeinen
2023-11-09 7:37 ` [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init() Tomi Valkeinen
2023-11-09 7:37 ` [PATCH v2 05/11] drm/tidss: Return error value from from softreset Tomi Valkeinen
2023-11-09 7:37 ` Tomi Valkeinen [this message]
2023-11-09 7:38 ` [PATCH v2 07/11] drm/tidss: Add simple K2G manual reset Tomi Valkeinen
2023-11-09 7:38 ` [PATCH v2 08/11] drm/tidss: Fix dss reset Tomi Valkeinen
2023-11-09 7:38 ` [PATCH v2 09/11] drm/tidss: IRQ code cleanup Tomi Valkeinen
2023-11-09 7:38 ` [PATCH v2 10/11] drm/tidss: Fix atomic_flush check Tomi Valkeinen
2023-11-09 7:38 ` [PATCH v2 11/11] drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY Tomi Valkeinen
2023-12-01 6:24 ` [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Aradhya Bhatia
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=20231109-tidss-probe-v2-6-ac91b5ea35c0@ideasonboard.com \
--to=tomi.valkeinen@ideasonboard.com \
--cc=a-bhatia1@ti.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=devarsht@ti.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=francesco@dolcini.it \
--cc=jyri.sarha@iki.fi \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/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®