Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763025AbZLQXZV (ORCPT ); Thu, 17 Dec 2009 18:25:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760945AbZLQXZR (ORCPT ); Thu, 17 Dec 2009 18:25:17 -0500 Received: from mail.windriver.com ([147.11.1.11]:57303 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760127AbZLQXZP (ORCPT ); Thu, 17 Dec 2009 18:25:15 -0500 From: Jason Wessel To: David Airlie Cc: linux-kernel@vger.kernel.org, Jason Wessel , David Airlie , Jesse Barnes , Clemens Ladisch Subject: [PATCH] drm_fb_helper: fix regression in pixclock check Date: Thu, 17 Dec 2009 17:25:03 -0600 Message-Id: <1261092303-4570-1-git-send-email-jason.wessel@windriver.com> X-Mailer: git-send-email 1.6.4.rc1 X-OriginalArrivalTime: 17 Dec 2009 23:25:09.0924 (UTC) FILETIME=[2CDD3640:01CA7F70] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1212 Lines: 34 Commit 5349ef3127c77075ff70b2014f17ae0fbcaaf199 changed pixclock to be initialized to zero instead of -1. The validation routine always returns -EINVAL for a valid pixclock which prevents atomic kernel mode setting from working correctly. CC: David Airlie CC: Jesse Barnes CC: Clemens Ladisch Signed-off-by: Jason Wessel --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 1b49fa0..7b59cf1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -602,7 +602,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, struct drm_framebuffer *fb = fb_helper->fb; int depth; - if (var->pixclock != 0) + if (!var->pixclock) return -EINVAL; /* Need to resize the fb object !!! */ -- 1.6.4.rc1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/