From patchwork Wed Jul 17 10:08:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Showliu X-Patchwork-Id: 18399 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17A5D25D87 for ; Wed, 17 Jul 2013 10:09:29 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf2610439qee.10 for ; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=zGygdVJ3WgjcxeNkHhydidqL/i4DTM4Bcf3rWjG0V7o=; b=cRIlIdxX0D27eZRZ4CDSlAhIaWFlJ1K6Ztx4fRCUeMp9M8JZyAR+bXztOm1F8upiEM vEZ1Q3CKq9jU3q4IIrpWYGZYCCQ0GEfUcpqhcJ7hLUY6ruxquo6l+mDtQ2PboD0NY7PS KAPHsIUitA/4gvMCWe2uvxIqRTkumufvX6LDhqQE6q/wJhKjqQPKw3bvsbgRMD1TLy7W Ul+EXnSVIkq/NLxM3Ya6brNoXgWVejJxAjjHVRffD3n8hDEGzy01n50EyTs0tKz2IrAo 20V4JDNuZicNR0yscfFnRA6o/rtAjjiIxgyMrSTvz967q2hYiyIa30bzO2BXbHzRt3fo B3lA== X-Received: by 10.236.206.105 with SMTP id k69mr3407413yho.8.1374055768787; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.98 with SMTP id n2ls828426qed.22.gmail; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) X-Received: by 10.52.34.196 with SMTP id b4mr1509602vdj.70.1374055768629; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id l5si647584vca.14.2013.07.17.03.09.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 03:09:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id d10so1323553vea.38 for ; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) X-Received: by 10.221.21.74 with SMTP id qr10mr1801710vcb.25.1374055768558; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp164345vcv; Wed, 17 Jul 2013 03:09:28 -0700 (PDT) X-Received: by 10.68.28.232 with SMTP id e8mr6081772pbh.94.1374055767616; Wed, 17 Jul 2013 03:09:27 -0700 (PDT) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by mx.google.com with ESMTPS id ap1si4484791pad.16.2013.07.17.03.09.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 03:09:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.176 is neither permitted nor denied by best guess record for domain of show.liu@linaro.org) client-ip=209.85.192.176; Received: by mail-pd0-f176.google.com with SMTP id t12so1669078pdi.21 for ; Wed, 17 Jul 2013 03:09:27 -0700 (PDT) X-Received: by 10.66.253.100 with SMTP id zz4mr7042935pac.48.1374055767052; Wed, 17 Jul 2013 03:09:27 -0700 (PDT) Received: from localhost.localdomain ([111.81.249.106]) by mx.google.com with ESMTPSA id v20sm9642806paj.4.2013.07.17.03.09.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 03:09:26 -0700 (PDT) From: Show Liu To: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org, tom.gall@linaro.org, pawel.moll@arm.com, t.katayama@jp.fujitsu.com, vikas.sajjan@linaro.org, linaro-kernel@lists.linaro.org, Show Liu Subject: [PATCH 1/2] Fixed for compatible with kernel 3.10.0-rc6 Date: Wed, 17 Jul 2013 18:08:56 +0800 Message-Id: <1374055737-6643-2-git-send-email-show.liu@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374055737-6643-1-git-send-email-show.liu@linaro.org> References: <1374055737-6643-1-git-send-email-show.liu@linaro.org> X-Gm-Message-State: ALoCoQkbc5y++YgDgXrI7MEbscuMmBbrFfHumbfBSBJlAjquZPhFR+qSxHjQMfgBb9QzrJtfz8NK X-Original-Sender: show.liu@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , --- drivers/video/Kconfig | 2 ++ drivers/video/fbmon.c | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2e14e0b..b0a0947 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -324,6 +324,7 @@ config FB_ARMCLCD select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_MODE_HELPERS if OF + select VIDEOMODE_HELPERS help This framebuffer device driver is for the ARM PrimeCell PL110 Colour LCD controller. ARM PrimeCells provide the building @@ -340,6 +341,7 @@ config FB_ARMHDLCD select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEOMODE_HELPERS help This framebuffer device driver is for the ARM High Definition Colour LCD controller. diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 304cf37..aaa5be7 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -1440,17 +1440,15 @@ void videomode_from_fb_var_screeninfo(const struct fb_var_screeninfo *var, vm->vback_porch = var->upper_margin; vm->vsync_len = var->vsync_len; - vm->dmt_flags = 0; + vm->flags = 0; if (var->sync & FB_SYNC_HOR_HIGH_ACT) - vm->dmt_flags |= VESA_DMT_HSYNC_HIGH; + vm->flags |= DISPLAY_FLAGS_HSYNC_HIGH; if (var->sync & FB_SYNC_VERT_HIGH_ACT) - vm->dmt_flags |= VESA_DMT_VSYNC_HIGH; - - vm->data_flags = 0; + vm->flags |= DISPLAY_FLAGS_VSYNC_HIGH; if (var->vmode & FB_VMODE_INTERLACED) - vm->data_flags |= DISPLAY_FLAGS_INTERLACED; + vm->flags |= DISPLAY_FLAGS_INTERLACED; if (var->vmode & FB_VMODE_DOUBLE) - vm->data_flags |= DISPLAY_FLAGS_DOUBLESCAN; + vm->flags |= DISPLAY_FLAGS_DOUBLESCAN; } EXPORT_SYMBOL_GPL(videomode_from_fb_var_screeninfo);