diff mbox

drm: Remove compiler BUG_ON() test

Message ID 1415066021-8403-1-git-send-email-peter@hurleysoftware.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Hurley Nov. 4, 2014, 1:53 a.m. UTC 
modeset->num_connectors must be 0 to reach the BUG_ON() which tests
for non-zero modeset->num_connectors; remove BUG_ON().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Daniel Vetter Nov. 4, 2014, 8:48 a.m. UTC | #1 
On Mon, Nov 03, 2014 at 08:53:41PM -0500, Peter Hurley wrote:
> modeset->num_connectors must be 0 to reach the BUG_ON() which tests
> for non-zero modeset->num_connectors; remove BUG_ON().
> 
> Signed-off-by: Peter Hurley <peter@hurleysoftware.com>

Also picked up into topic/core-stuff. I'll probably send the pull for that
to Dave's drm-next in a few days.
-Daniel

> ---
>  drivers/gpu/drm/drm_fb_helper.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index d934346..7198257 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -1573,7 +1573,6 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
>  		modeset = &fb_helper->crtc_info[i].mode_set;
>  		if (modeset->num_connectors == 0) {
>  			BUG_ON(modeset->fb);
> -			BUG_ON(modeset->num_connectors);
>  			if (modeset->mode)
>  				drm_mode_destroy(dev, modeset->mode);
>  			modeset->mode = NULL;
> -- 
> 2.1.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index d934346..7198257 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1573,7 +1573,6 @@  static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
 		modeset = &fb_helper->crtc_info[i].mode_set;
 		if (modeset->num_connectors == 0) {
 			BUG_ON(modeset->fb);
-			BUG_ON(modeset->num_connectors);
 			if (modeset->mode)
 				drm_mode_destroy(dev, modeset->mode);
 			modeset->mode = NULL;