From e9b4b6a2635731b8180163c181b908413a39df76 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 6 Mar 2008 13:39:18 +0900 Subject: [PATCH] --- yaml --- r: 87015 b: refs/heads/master c: fcb1fec7fece6b9889deaedf5b7d21f4f5a26381 h: refs/heads/master i: 87013: e0b114e86918fc1a059d6456147a05dda8892cc2 87011: 1233ee83ede788dcc16fa891496dfb7ecf238a9c 87007: 4c7fbf26e96390e3fd34696823041e9055fb0055 v: v3 --- [refs] | 2 +- trunk/drivers/video/pvr2fb.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 48698cb5306b..d451bd04f97a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2839ed83f54d40870747ac8d655504dff63d1c5 +refs/heads/master: fcb1fec7fece6b9889deaedf5b7d21f4f5a26381 diff --git a/trunk/drivers/video/pvr2fb.c b/trunk/drivers/video/pvr2fb.c index 6a3d0b574897..8c863a7f654b 100644 --- a/trunk/drivers/video/pvr2fb.c +++ b/trunk/drivers/video/pvr2fb.c @@ -1,16 +1,12 @@ -/* drivers/video/pvr2fb.c +/* + * drivers/video/pvr2fb.c * * Frame buffer and fbcon support for the NEC PowerVR2 found within the Sega * Dreamcast. * * Copyright (c) 2001 M. R. Brown - * Copyright (c) 2001, 2002, 2003, 2004, 2005 Paul Mundt - * - * This file is part of the LinuxDC project (linuxdc.sourceforge.net). + * Copyright (c) 2001 - 2008 Paul Mundt * - */ - -/* * This driver is mostly based on the excellent amifb and vfb sources. It uses * an odd scheme for converting hardware values to/from framebuffer values, * here are some hacked-up formulas: @@ -490,7 +486,7 @@ static int pvr2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) } else { var->sync &= ~FB_SYNC_BROADCAST; var->vmode &= ~FB_VMODE_INTERLACED; - var->vmode |= pvr2_var.vmode; + var->vmode |= FB_VMODE_NONINTERLACED; } if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_TEST) {