dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: dri-devel@lists.freedesktop.org
Cc: Egbert Eich <eich@suse.de>, Dave Airlie <airlied@redhat.com>,
	Mathieu Larouche <mathieu.larouche@matrox.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 13/14] drm/mgag200: Add mode validation debugging code
Date: Tue, 18 Jul 2017 16:43:19 +0200	[thread overview]
Message-ID: <20170718144320.8354-14-tiwai@suse.de> (raw)
In-Reply-To: <20170718144320.8354-1-tiwai@suse.de>

From: Egbert Eich <eich@suse.de>

Give more verbose debug message at mode bandwidth checks.

Signed-off-by: Egbert Eich <eich@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/drm/mgag200/mgag200_mode.c | 51 +++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 77b8efcd3c65..50efb10f86c5 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1698,6 +1698,21 @@ static uint32_t mga_vga_calculate_mode_bandwidth(struct drm_display_mode *mode,
 	return (uint32_t)(bandwidth);
 }
 
+static bool mga_vga_check_mode_bandwidth(struct drm_display_mode *mode,
+					 int bits_per_pixel,
+					 unsigned int max_bw)
+{
+	unsigned int bw;
+
+	bw = mga_vga_calculate_mode_bandwidth(mode, bits_per_pixel);
+	if (bw > max_bw) {
+		DRM_DEBUG_KMS("Mode %d:%s exceeds bandwidth: %d > %d",
+			      mode->base.id, mode->name, bw, max_bw);
+		return false;
+	}
+	return true;
+}
+
 #define MODE_BANDWIDTH	MODE_BAD
 
 static int mga_vga_mode_valid(struct drm_connector *connector,
@@ -1721,20 +1736,20 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
 				return MODE_VIRTUAL_X;
 			if (mode->vdisplay > 1200)
 				return MODE_VIRTUAL_Y;
-			if (mga_vga_calculate_mode_bandwidth(mode, bpp)
-				> (24400 * 1024))
+			if (mga_vga_check_mode_bandwidth(mode, bpp,
+							 24400 * 1024))
 				return MODE_BANDWIDTH;
 		} else if (mdev->unique_rev_id == 0x02) {
 			if (mode->hdisplay > 1920)
 				return MODE_VIRTUAL_X;
 			if (mode->vdisplay > 1200)
 				return MODE_VIRTUAL_Y;
-			if (mga_vga_calculate_mode_bandwidth(mode, bpp)
-				> (30100 * 1024))
+			if (mga_vga_check_mode_bandwidth(mode, bpp,
+							 30100 * 1024))
 				return MODE_BANDWIDTH;
 		} else {
-			if (mga_vga_calculate_mode_bandwidth(mode, bpp)
-				> (55000 * 1024))
+			if (mga_vga_check_mode_bandwidth(mode, bpp,
+							 55000 * 1024))
 				return MODE_BANDWIDTH;
 		}
 	} else if (mdev->type == G200_WB) {
@@ -1742,21 +1757,17 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
 			return MODE_VIRTUAL_X;
 		if (mode->vdisplay > 1024)
 			return MODE_VIRTUAL_Y;
-		if (mga_vga_calculate_mode_bandwidth(mode,
-			bpp > (31877 * 1024)))
+		if (mga_vga_check_mode_bandwidth(mode, bpp, 31877 * 1024))
+			return MODE_BANDWIDTH;
+	} else if (mdev->type == G200_EV) {
+		if (mga_vga_check_mode_bandwidth(mode, bpp, 32700 * 1024))
+			return MODE_BANDWIDTH;
+	} else if (mdev->type == G200_EH) {
+		if (mga_vga_check_mode_bandwidth(mode, bpp, 37500 * 1024))
+			return MODE_BANDWIDTH;
+	} else if (mdev->type == G200_ER) {
+		if (mga_vga_check_mode_bandwidth(mode, bpp, 55000 * 1024))
 			return MODE_BANDWIDTH;
-	} else if (mdev->type == G200_EV &&
-		(mga_vga_calculate_mode_bandwidth(mode, bpp)
-			> (32700 * 1024))) {
-		return MODE_BANDWIDTH;
-	} else if (mdev->type == G200_EH &&
-		(mga_vga_calculate_mode_bandwidth(mode, bpp)
-			> (37500 * 1024))) {
-		return MODE_BANDWIDTH;
-	} else if (mdev->type == G200_ER &&
-		(mga_vga_calculate_mode_bandwidth(mode,
-			bpp) > (55000 * 1024))) {
-		return MODE_BANDWIDTH;
 	}
 
 	if ((mode->hdisplay % 8) != 0 || (mode->hsync_start % 8) != 0 ||
-- 
2.13.2

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

  parent reply	other threads:[~2017-07-18 14:43 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-18 14:43 [PATCH 00/14] mgag200 fixes Takashi Iwai
2017-07-18 14:43 ` [PATCH 01/14] drm/mgag200: Add doublescan and interlace support Takashi Iwai
2017-07-18 14:43 ` [PATCH 02/14] drm/mgag200: Add additional limits for certain G200 variants Takashi Iwai
2017-07-18 14:43 ` [PATCH 03/14] drm/mgag200: Fix memleak in error path in mgag200_bo_create() Takashi Iwai
2017-07-18 14:43 ` [PATCH 04/14] drm/mgag200: Free container instead of member in mga_user_framebuffer_destroy() Takashi Iwai
2017-07-18 14:43 ` [PATCH 05/14] drm/mgag200: Initialize data needed to map fbdev memory Takashi Iwai
2017-07-18 14:43 ` [PATCH 06/14] drm/mgag200: Simplify function mgag200_ttm_placement() Takashi Iwai
2017-07-18 14:43 ` [PATCH 07/14] drm/mgag200: Add support for MATROX PCI device IDs 0x520 and 0x521 Takashi Iwai
2017-07-20  4:17   ` Dave Airlie
2017-07-20  9:47     ` Takashi Iwai
2017-07-20 15:05       ` Egbert Eich
2017-07-18 14:43 ` [PATCH 08/14] drm/mgag200: Cleanup cursor BOs properly Takashi Iwai
2017-07-18 14:43 ` [PATCH 09/14] drm/mgag200: Add missing drm_connector_unregister() Takashi Iwai
2017-07-19  8:44   ` Takashi Iwai
2017-07-20  8:15     ` Daniel Vetter
2017-07-18 14:43 ` [PATCH 10/14] drm/mgag200: Don't use crtc_* parameters for validation Takashi Iwai
2017-07-19  6:38   ` Daniel Vetter
2017-07-18 14:43 ` [PATCH 11/14] drm/mgag200: Consolidate depth/bpp handling Takashi Iwai
2017-07-20 11:58   ` Paul Menzel
2017-07-20 12:08     ` Takashi Iwai
2017-07-18 14:43 ` [PATCH 12/14] drm/mgag200: Add command line option to specify preferred depth Takashi Iwai
2017-07-18 14:43 ` Takashi Iwai [this message]
2017-07-18 14:43 ` [PATCH 14/14] drm/mgag200: Implement basic PM support Takashi Iwai
2017-08-01 19:25 ` [PATCH 00/14] mgag200 fixes Mathieu Larouche
2017-08-01 21:18   ` Takashi Iwai

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=20170718144320.8354-14-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=airlied@redhat.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=eich@suse.de \
    --cc=mathieu.larouche@matrox.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;
as well as URLs for NNTP newsgroup(s).