From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3A07C43381 for ; Mon, 1 Apr 2019 17:41:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A983B20857 for ; Mon, 1 Apr 2019 17:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140508; bh=tG0TyyQLQhaJWWLvYQZMUDS00QZ73abVZn9gJHlW+ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b1vGuNXrEGZ26oJS5/xjFN0nQTXqO5tnF3XoZz609hG4j/ChI0NPJO0SdT/K4igWv 5GSr8hxVVU9q5pBp7FkuVBZx4pYogDXVptAJWyHfTDXFI5y4sILAojnE1YVORpfPNS DBqSDEoojlCLpEZWtHClvg9geP7Em+20MSWIh/WU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388233AbfDARhr (ORCPT ); Mon, 1 Apr 2019 13:37:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:50668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388227AbfDARhr (ORCPT ); Mon, 1 Apr 2019 13:37:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F47020830; Mon, 1 Apr 2019 17:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140266; bh=tG0TyyQLQhaJWWLvYQZMUDS00QZ73abVZn9gJHlW+ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=li5w5Kq6WRIUd28x+kS2RvScO5WGPMQyt/UzXUPxdDgv1whUH7NWDl76iN4Q0F8Cd 0KxmkLCnVZcIcTO9uSeFQRdDL1+tUhqDIrE7GTDih6OEMT8DYv6YonXZUAqxn2l7mw 4D2VA6UKowBmIEeeqhU2tfA7btPl4aNchOvvZrCk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoffer Dall , Peter Maydell , Roman Kiryanov , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 3.18 24/50] video: fbdev: Set pixclock = 0 in goldfishfb Date: Mon, 1 Apr 2019 19:03:07 +0200 Message-Id: <20190401170044.055727500@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170041.257273804@linuxfoundation.org> References: <20190401170041.257273804@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit ace6033ec5c356615eaa3582fb1946e9eaff6662 ] User space Android code identifies pixclock == 0 as a sign for emulation and will set the frame rate to 60 fps when reading this value, which is the desired outcome. Signed-off-by: Christoffer Dall Signed-off-by: Peter Maydell Signed-off-by: Roman Kiryanov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/goldfishfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c index 14a93cb21310..66d58e93bc32 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c @@ -234,7 +234,7 @@ static int goldfish_fb_probe(struct platform_device *pdev) fb->fb.var.activate = FB_ACTIVATE_NOW; fb->fb.var.height = readl(fb->reg_base + FB_GET_PHYS_HEIGHT); fb->fb.var.width = readl(fb->reg_base + FB_GET_PHYS_WIDTH); - fb->fb.var.pixclock = 10000; + fb->fb.var.pixclock = 0; fb->fb.var.red.offset = 11; fb->fb.var.red.length = 5; -- 2.19.1