From patchwork Thu Mar 1 15:27:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130297 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952900edc; Thu, 1 Mar 2018 07:38:56 -0800 (PST) X-Google-Smtp-Source: AG47ELsOPIWyu0yOyOMvLxAUCL0mkt4bFQtWWQsAhelQjaYJNI/yVgxii4b+/W3U3thph3ZQrNM/ X-Received: by 10.99.111.196 with SMTP id k187mr1842306pgc.360.1519918736056; Thu, 01 Mar 2018 07:38:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918736; cv=none; d=google.com; s=arc-20160816; b=QMhaYN1dEuR8sYVFH68lA3ILmkvlFH+BTBYxkdi8Hwyh0yhA2/s7GeRrwNXfCfF3+g whN1tbHlAd/eTjtGa8FFclL7PHzHWmhlwUbZV1o08pifBbLwv24DJAM9igEZSonWuvA8 tWFYrLwgQDjuDbEhKCmfgHGXpMpfcalKmiBg6WLSjQ6yETH9OxGsFL4ZCmOxhdyYve2t VJInm6gkCkCMelHVNIyuohEE5JjEgG+zQojNhxbzA3UcPhu8nxlb78fFJMPG6Z82PPgy 4Lev5KjU+2CcUlvXmpR2pRDCS6bz7icD5zTSsZ5oqdd1iZgIG0rrhycoLvJjFjsAJ9Z8 er1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=1g6v1wV1Y+EuIlNkmK/VZl4RPQ71sPOp3TLMg0Obstg=; b=KUXe/evfL4FOGQ9P70AFZxWzHlb1yg3JxSL5OBjB6wmgkTc8dr2DpftVaaEdcGJhuw nXyD14M3N6tdRga0oStjunm8tmTc3vbZAScXgSPKcStLBtsLykqsS4qlhml5Mx0yq7Hx UDAULb2f1JxPCDE6vdiMq5MGPVUAPC2gHYqgAfNutM6AtLB6MAjzvBvc9jprh3LOu1XG W0GIeBI2S2BI+AcU2uUj5z9UdmT7YIgBNa2CfuOLUkWFN8B7B8PeZo2LKXfJdO1FYun4 MVx0dUIeRV45MGx7qRmhMCo6fLCpbKVWx7f8UjYW7Ckoz/dY1x2XVdlpahV8XKAJfeDI 882Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QLHp5NgV; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.38.55; Thu, 01 Mar 2018 07:38:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QLHp5NgV; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032566AbeCAPix (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:53 -0500 Received: from mail-sn1nam02on0103.outbound.protection.outlook.com ([104.47.36.103]:11220 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032292AbeCAPi2 (ORCPT ); Thu, 1 Mar 2018 10:38:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1g6v1wV1Y+EuIlNkmK/VZl4RPQ71sPOp3TLMg0Obstg=; b=QLHp5NgVi4OHX1OJAPbFleUexHamwRZifutVnX3lA8bzC9Khe1OzuAMn1N40wAdDdFnYvSlj6Nwk1j3+ifr9V4UMVbOWgRjM4dtSsFZdxfhTTtolg/648Q6AlVwksmef37RV/AJbl1+CHLwxtfTRyHP9ecCTTF6yDf7WXk22vLA= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1016.namprd21.prod.outlook.com (52.132.133.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:24 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:24 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Tomi Valkeinen , Sasha Levin Subject: [added to the 4.1 stable tree] fbdev: sis: enforce selection of at least one backend Thread-Topic: [added to the 4.1 stable tree] fbdev: sis: enforce selection of at least one backend Thread-Index: AQHTsXHK3xipFmTQe0qRjx1plFV2uA== Date: Thu, 1 Mar 2018 15:27:20 +0000 Message-ID: <20180301152116.1486-453-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1016; 6:M59UgNPMz83yoWEM3iCgHnDmHecjGAybsr9zN2r6x1yi3Bcna20H9lCR4NZSywgnM69LW75Aaq9R+Cfl4m2z5qfWan/EsBb7HtlahDyuQvSWx6e8DoDnXo21/7cOwQ213DOq5h1nP9z4987t9fCSdEkuzPFEcDJVQfT+GHpkuRRkW7vLm/nyWgEOwS63v7M5cspBYNLx+e0ftA1JmqTffWI5SLzEiDSeY84DyqApMlhm5oovX3RcDfkdJj0+K/ADzmkR63cszjJyNZw1vvWa5luAWwRmsQjwyZBgzUDrhAUuNP8hB0rFVwBQMRBsH7up8T22+FV2juoYRYN9cHvtpx6Ny0OzArIGL9u+xP9IyB5zRxnHxezQwdDUb9khKtqo; 5:DpMp8d3DcgbAwHoZxlIOODhTI9pMSg9UvIyJ+J5WU64nh3+RdC+qX2gNsOiozs+JJCGmU9NGEvCZGI777199+Ypub5wEdh8Pn1bwzXtCvtRhujqc+Jbmpgd+ctlQDYycsBX/Fb8WkfJP/o+EIPEm2ZuWs1DjC5fcaUUbBeD0JOE=; 24:T6qAgD3fnU2FgbN5JpxyzAxNnt16efFPywDIuo5JwhEZqm5xkbIYQPD1ZHfDWOv2OxGSu+KPfHrCP+HX1HEN4ve8bV48zkm8m5J6NobDoqI=; 7:Jxux2Uc3zFJH6dLHnmlgziZpKs4ObQ7DC+q27/uFeFgnw97fbFqO+bNOAOiaPvi/WOItBNGy7OvsQC10BuYwpFVQjKaW+fYQfsv00QY3DsPaX+uuWIQlB8J1p/RCUg38sNx6bCBNHxUauAlPGBKQjvKjQdxRxdAeE5T5pddOWQW4+ZpcMC4Lmy5vaE0y5uXHjVG7ZG/9KPm2wkV28zLCeeplFLB/M1+7IZa3QXz3fq1kFfJchY2GmllGl1q+NCvY x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9355b7e4-488f-4bc9-ad06-08d57f8a782b x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1016; x-ms-traffictypediagnostic: DM5PR2101MB1016: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1016; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1016; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(376002)(396003)(189003)(199004)(22452003)(6436002)(8676002)(81156014)(81166006)(53936002)(68736007)(6486002)(6512007)(97736004)(5660300001)(86362001)(59450400001)(6506007)(102836004)(6346003)(2906002)(26005)(186003)(4326008)(10290500003)(8936002)(76176011)(478600001)(105586002)(3280700002)(14454004)(54906003)(110136005)(3660700001)(2950100002)(305945005)(7736002)(6116002)(72206003)(1076002)(3846002)(6666003)(316002)(2900100001)(25786009)(36756003)(2501003)(66066001)(107886003)(106356001)(5250100002)(86612001)(99286004)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1016; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: u5lnU4WKlgoUNF5cfw37mJCuTMiSfO2libh+oUz9WYe73Sg1C718qKk4+MZPeIrn8KC4Y0UXts2jtJbrZPLbM4SLuSnIM/cQ4BWRXnonHm0tg56gZaCcCwkFnHcUcuYNhxS/9nEdtEAYXgpl2uLLpjrc5WKJKSzMkF3MRATAVHQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9355b7e4-488f-4bc9-ad06-08d57f8a782b X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:20.5714 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1016 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 5b833fea4377577eafecb888141a05470922ef25 ] The sis framebuffer driver complains with a compile-time warning if neither the FB_SIS_300 nor FB_SIS_315 symbols are selected: drivers/video/fbdev/sis/sis_main.c:61:2: warning: #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is se This is reasonable because it doesn't work in that case, but it's also annoying for randconfig builds and is one of the most common warnings I'm seeing on ARM now. This changes the Kconfig logic to prevent the silly configuration, by always selecting the FB_SIS_300 variant if the other one is not set. Signed-off-by: Arnd Bergmann Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- drivers/video/fbdev/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 44eb7c737ea2..34af3a26472c 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1506,6 +1506,7 @@ config FB_SIS select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_BOOT_VESA_SUPPORT if FB_SIS = y + select FB_SIS_300 if !FB_SIS_315 help This is the frame buffer device driver for the SiS 300, 315, 330 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.