From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@redhat.com, daniel@ffwll.ch, sam@ravnborg.org,
emil.velikov@collabora.com, kraxel@redhat.com,
john.p.donnelly@oracle.com, lyude@redhat.com
Cc: Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org
Subject: [PATCH 5/7] drm/mgag200: Set/clear <syncrst> field in display enable/disable helpers
Date: Tue, 7 Jul 2020 10:24:09 +0200 [thread overview]
Message-ID: <20200707082411.6583-6-tzimmermann@suse.de> (raw)
In-Reply-To: <20200707082411.6583-1-tzimmermann@suse.de>
Modifying the <syncrst> field in mgag200_{enable,disable}_display()
makes the code more readable. Also clear the <asyncrst> field to enable
the display. The other bits in SEQ0 are unused, so no functional changes
are made.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +++++++++++------
drivers/gpu/drm/mgag200/mgag200_reg.h | 3 +++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 05f8aa50b908..679eb5abe24d 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1284,7 +1284,12 @@ static void mgag200_g200ev_set_hiprilvl(struct mga_device *mdev)
static void mgag200_enable_display(struct mga_device *mdev)
{
- u8 seq1, crtcext1;
+ u8 seq0, seq1, crtcext1;
+
+ RREG_SEQ(0x00, seq0);
+ seq0 |= MGAREG_SEQ0_SYNCRST |
+ MGAREG_SEQ0_ASYNCRST;
+ WREG_SEQ(0x00, seq0);
/*
* TODO: replace busy waiting with vblank IRQ; put
@@ -1307,7 +1312,11 @@ static void mgag200_enable_display(struct mga_device *mdev)
static void mgag200_disable_display(struct mga_device *mdev)
{
- u8 seq1, crtcext1;
+ u8 seq0, seq1, crtcext1;
+
+ RREG_SEQ(0x00, seq0);
+ seq0 &= ~MGAREG_SEQ0_SYNCRST;
+ WREG_SEQ(0x00, seq0);
/*
* TODO: replace busy waiting with vblank IRQ; put
@@ -1338,9 +1347,6 @@ static void mga_crtc_prepare(struct drm_crtc *crtc)
struct drm_device *dev = crtc->dev;
struct mga_device *mdev = to_mga_device(dev);
- /* start sync reset */
- WREG_SEQ(0, 1);
-
if (mdev->type == G200_WB || mdev->type == G200_EW3)
mga_g200wb_prepare(crtc);
}
@@ -1357,7 +1363,6 @@ static void mga_crtc_commit(struct drm_crtc *crtc)
if (mdev->type == G200_WB || mdev->type == G200_EW3)
mga_g200wb_commit(crtc);
- WREG_SEQ(0, 0x3);
mga_crtc_load_lut(crtc);
mgag200_enable_display(mdev);
}
diff --git a/drivers/gpu/drm/mgag200/mgag200_reg.h b/drivers/gpu/drm/mgag200/mgag200_reg.h
index 9f0be1878854..c3b7bcad52ed 100644
--- a/drivers/gpu/drm/mgag200/mgag200_reg.h
+++ b/drivers/gpu/drm/mgag200/mgag200_reg.h
@@ -236,6 +236,9 @@
#define MGAREG_SEQ_INDEX 0x1fc4
#define MGAREG_SEQ_DATA 0x1fc5
+#define MGAREG_SEQ0_ASYNCRST BIT(0)
+#define MGAREG_SEQ0_SYNCRST BIT(1)
+
#define MGAREG_SEQ1_SCROFF BIT(5)
#define MGAREG_CRTC_INDEX 0x1fd4
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-07 8:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 8:24 [PATCH 0/7] drm/mgag200: Inline prepare/commit helpers Thomas Zimmermann
2020-07-07 8:24 ` [PATCH 1/7] drm/mgag200: Don't write-protect CRTC 0-7 while in mga_crtc_prepare() Thomas Zimmermann
2020-07-07 8:24 ` [PATCH 2/7] drm/mgag200: Move PLL setup out of mode-setting function Thomas Zimmermann
2020-07-07 8:24 ` [PATCH 3/7] drm/mgag200: Don't set or clear <scroff> field during modeset Thomas Zimmermann
2020-07-07 8:24 ` [PATCH 4/7] drm/mgag200: Split DPMS function into helpers Thomas Zimmermann
2020-07-07 8:24 ` Thomas Zimmermann [this message]
2020-07-07 8:24 ` [PATCH 6/7] drm/mgag200: Rename G200WB prepare/commit function Thomas Zimmermann
2020-07-07 8:24 ` [PATCH 7/7] drm/mgag200: Inline mga_crtc_{prepare, commit}() into enable function Thomas Zimmermann
2020-07-07 16:40 ` [PATCH 0/7] drm/mgag200: Inline prepare/commit helpers Lyude Paul
2020-07-14 9:02 ` Thomas Zimmermann
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=20200707082411.6583-6-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=john.p.donnelly@oracle.com \
--cc=kraxel@redhat.com \
--cc=lyude@redhat.com \
--cc=sam@ravnborg.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: 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).