From: Sam Ravnborg <sam@ravnborg.org>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: john.p.donnelly@oracle.com, dri-devel@lists.freedesktop.org,
kraxel@redhat.com, airlied@redhat.com
Subject: Re: [PATCH 13/17] drm/mgag200: Move hiprilvl setting into separate functions
Date: Sun, 3 May 2020 19:23:15 +0200 [thread overview]
Message-ID: <20200503172315.GE23105@ravnborg.org> (raw)
In-Reply-To: <20200429143238.10115-14-tzimmermann@suse.de>
On Wed, Apr 29, 2020 at 04:32:34PM +0200, Thomas Zimmermann wrote:
> The hiprivlvl settings are now updated in mgag200_g200se_set_hiprilvl()
> and mgag200_g200ev_set_hiprilvl().
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/mgag200/mgag200_mode.c | 98 ++++++++++++++------------
> 1 file changed, 54 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index 6b88c306ff4d7..a04404c5aa769 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -1118,6 +1118,56 @@ static void mgag200_g200er_reset_tagfifo(struct mga_device *mdev)
> WREG_SEQ(0x01, seq1);
> }
>
> +static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev,
> + const struct drm_display_mode *mode,
> + const struct drm_framebuffer *fb)
> +{
> + unsigned int hiprilvl;
> + uint8_t crtcext6;
> +
> + if (mdev->unique_rev_id >= 0x04) {
> + hiprilvl = 0;
> + } else if (mdev->unique_rev_id >= 0x02) {
> + unsigned int bpp;
> + unsigned long mb;
> +
> + if (fb->format->cpp[0] * 8 > 16)
> + bpp = 32;
> + else if (fb->format->cpp[0] * 8 > 8)
> + bpp = 16;
> + else
> + bpp = 8;
> +
> + mb = (mode->clock * bpp) / 1000;
> + if (mb > 3100)
> + hiprilvl = 0;
> + else if (mb > 2600)
> + hiprilvl = 1;
> + else if (mb > 1900)
> + hiprilvl = 2;
> + else if (mb > 1160)
> + hiprilvl = 3;
> + else if (mb > 440)
> + hiprilvl = 4;
> + else
> + hiprilvl = 5;
> +
> + } else if (mdev->unique_rev_id >= 0x01) {
> + hiprilvl = 3;
> + } else {
> + hiprilvl = 4;
> + }
> +
> + crtcext6 = hiprilvl; /* implicitly sets maxhipri to 0 */
> +
> + WREG_ECRT(0x06, crtcext6);
> +}
> +
> +static void mgag200_g200ev_set_hiprilvl(struct mga_device *mdev)
> +{
> + WREG_ECRT(0x06, 0x00);
> +}
> +
> static int mga_crtc_mode_set(struct drm_crtc *crtc,
> struct drm_display_mode *mode,
> struct drm_display_mode *adjusted_mode,
> @@ -1236,10 +1286,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> if (mdev->type == G200_EW3)
> WREG_ECRT(0x34, 0x5);
>
> - if (mdev->type == G200_EV) {
> - WREG_ECRT(6, 0);
> - }
> -
> misc = RREG8(MGA_MISC_IN);
> misc |= MGAREG_MISC_IOADSEL |
> MGAREG_MISC_RAMMAPEN |
> @@ -1255,47 +1301,11 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> if (mdev->type == G200_ER)
> mgag200_g200er_reset_tagfifo(mdev);
>
> + if (IS_G200_SE(mdev))
> + mgag200_g200se_set_hiprilvl(mdev, mode, fb);
> + else if (mdev->type == G200_EV)
> + mgag200_g200ev_set_hiprilvl(mdev);
>
> - if (IS_G200_SE(mdev)) {
> - if (mdev->unique_rev_id >= 0x04) {
> - WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
> - WREG8(MGAREG_CRTCEXT_DATA, 0);
> - } else if (mdev->unique_rev_id >= 0x02) {
> - u8 hi_pri_lvl;
> - u32 bpp;
> - u32 mb;
> -
> - if (fb->format->cpp[0] * 8 > 16)
> - bpp = 32;
> - else if (fb->format->cpp[0] * 8 > 8)
> - bpp = 16;
> - else
> - bpp = 8;
> -
> - mb = (mode->clock * bpp) / 1000;
> - if (mb > 3100)
> - hi_pri_lvl = 0;
> - else if (mb > 2600)
> - hi_pri_lvl = 1;
> - else if (mb > 1900)
> - hi_pri_lvl = 2;
> - else if (mb > 1160)
> - hi_pri_lvl = 3;
> - else if (mb > 440)
> - hi_pri_lvl = 4;
> - else
> - hi_pri_lvl = 5;
> -
> - WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
> - WREG8(MGAREG_CRTCEXT_DATA, hi_pri_lvl);
> - } else {
> - WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
> - if (mdev->unique_rev_id >= 0x01)
> - WREG8(MGAREG_CRTCEXT_DATA, 0x03);
> - else
> - WREG8(MGAREG_CRTCEXT_DATA, 0x04);
> - }
> - }
> return 0;
> }
>
> --
> 2.26.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-03 17:23 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 14:32 [PATCH 00/17] drm/mgag200: Convert to atomic modesetting Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 01/17] drm/mgag200: Remove HW cursor Thomas Zimmermann
2020-04-29 17:51 ` Sam Ravnborg
2020-04-30 7:03 ` Gerd Hoffmann
2020-04-30 8:10 ` Thomas Zimmermann
2020-04-30 9:19 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 02/17] drm/mgag200: Remove unused fields from struct mga_device Thomas Zimmermann
2020-04-29 17:49 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 03/17] drm/mgag200: Embed connector instance in " Thomas Zimmermann
2020-04-29 15:24 ` Ruhl, Michael J
2020-04-29 17:49 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 04/17] drm/mgag200: Use managed mode-config initialization Thomas Zimmermann
2020-04-29 17:55 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 05/17] drm/mgag200: Clean up mga_set_start_address() Thomas Zimmermann
2020-04-29 18:20 ` Sam Ravnborg
2020-04-30 8:23 ` Thomas Zimmermann
2020-05-11 12:41 ` Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 06/17] drm/mgag200: Clean up mga_crtc_do_set_base() Thomas Zimmermann
2020-04-29 18:23 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 07/17] drm/mgag200: Move mode-setting code into separate helper function Thomas Zimmermann
2020-04-29 18:24 ` Sam Ravnborg
2020-04-30 8:27 ` Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 08/17] drm/mgag200: Split MISC register update into PLL selection, SYNC and I/O Thomas Zimmermann
2020-05-03 15:34 ` Sam Ravnborg
2020-05-04 13:03 ` Thomas Zimmermann
2020-05-04 14:25 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 09/17] drm/mgag200: Update mode registers after plane registers Thomas Zimmermann
2020-05-03 15:34 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 10/17] drm/mgag200: Set pitch in a separate helper function Thomas Zimmermann
2020-05-03 15:42 ` Sam Ravnborg
2020-05-04 13:10 ` Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 11/17] drm/mgag200: Set primary plane's format in " Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 12/17] drm/mgag200: Move TAGFIFO reset into separate function Thomas Zimmermann
2020-05-03 16:25 ` Sam Ravnborg
2020-05-04 13:11 ` Thomas Zimmermann
2020-05-04 14:29 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 13/17] drm/mgag200: Move hiprilvl setting into separate functions Thomas Zimmermann
2020-05-03 17:23 ` Sam Ravnborg [this message]
2020-04-29 14:32 ` [PATCH 14/17] drm/mgag200: Move register initialization into separate function Thomas Zimmermann
2020-05-03 17:25 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 15/17] drm/mgag200: Remove waiting from DPMS code Thomas Zimmermann
2020-05-04 12:10 ` Daniel Vetter
2020-05-04 12:40 ` Thomas Zimmermann
2020-04-29 14:32 ` [PATCH 16/17] drm/mgag200: Convert to simple KMS helper Thomas Zimmermann
2020-05-03 17:36 ` Sam Ravnborg
2020-04-29 14:32 ` [PATCH 17/17] drm/mgag200: Replace VRAM helpers with SHMEM helpers Thomas Zimmermann
2020-05-04 12:29 ` Emil Velikov
2020-05-04 12:45 ` Thomas Zimmermann
2020-04-30 0:11 ` [PATCH 00/17] drm/mgag200: Convert to atomic modesetting John Donnelly
2020-04-30 8:29 ` Thomas Zimmermann
2020-04-30 12:09 ` John Donnelly
2020-05-04 13:39 ` Thomas Zimmermann
2020-05-04 20:39 ` John Donnelly
2020-05-05 12:20 ` John Donnelly
2020-05-06 7:29 ` 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=20200503172315.GE23105@ravnborg.org \
--to=sam@ravnborg.org \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=john.p.donnelly@oracle.com \
--cc=kraxel@redhat.com \
--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