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=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 DED66C4727C for ; Wed, 30 Sep 2020 14:40:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D36C206FC for ; Wed, 30 Sep 2020 14:40:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dDfbL+g6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="KRyg9+ku" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D36C206FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OCXsvXDEZx1tpOUkSlxjBCyCZZUocLIPEijOX6AD5zI=; b=dDfbL+g6WDygULkJkrznfKpcC gkC1xg9e9wtI0pVzhN6rSQaUfGYdZ2p4xVTMq4PR5CeaV/1CHv27N+TzkQ9PS+AOILRGk8Xd54SiF ibKXsl/s2bT9AJy8psiJYVd49qwRe/AkOkWdc/jc6HhY1rolO3sWae/cUGvJ/WtedlyFXboNLGCa3 QD2ScnlM2JbUBHnf8mdk1YxkmtV0n7Ngw3uRQSIDs4om+dM0G9x/R88qV/Fk+S6ZXBGBstIwzOxsq 9S0UGnhzRsJqR+MS+vJTtnl5/zK4sSMi0oUBFPvV4JPPd2n3vOs/aqsrSmyW6pcS4ol5Xr4+e3ZCg 0pEl7e0yA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNdFw-0007uW-Ax; Wed, 30 Sep 2020 14:38:56 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNdFr-0007tk-UT for linux-arm-kernel@lists.infradead.org; Wed, 30 Sep 2020 14:38:54 +0000 Received: by mail-wm1-x344.google.com with SMTP id v12so2043438wmh.3 for ; Wed, 30 Sep 2020 07:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=BLfz0lXEqqqRZm9lMojCpzQaTSWjgax9HjaJB5dF8BQ=; b=KRyg9+ku+YzrKzfh8gLdQg5VHuWYJlM5uxQbs35JQvPzvnkps0Ml3Lt0U621HSa49B rTIM1QfeDuhcE3jsZ5lrliq4kWH93qUu6Rly9TbVrJL22+ntQJieqVUtiJk4gijFnWuP 85XvRFN09V8hFpm1/LE9CdgAVI1aOMj1N1lOg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BLfz0lXEqqqRZm9lMojCpzQaTSWjgax9HjaJB5dF8BQ=; b=UT6/kc8DKa71tDnGgsFzwO8R4NgX8E2MGr4maHyak3PgF/WYr8Ry/86JURQ56e1Lqh ULV/1OQUfxZDtI8pjwZL/3K3uXuiSXdKZy6dyVflA9RIsRsIQBymVWvoqYzLN0LXlMyK b9dhsfAIAH/wc0nW1U/qJjxO6gKnyfCd0VUZtBkZ+yd6AUcM71BbFlgk9cvd6Wq/OlEU auhoO7y/5oDx+dW3R5GKR1cCFWU2Rb3j+POYX35VBoYZIbZJ9TeQb7UlaTMcHgg7oPU0 LqBcDHMUe/YsPb3yj8hAlUfN/oa3kzwWr6ZvI4al1Sxe2EbrPhn767XSJpyQOHxeXo50 11wg== X-Gm-Message-State: AOAM532zPAzSHXUce/evn6AcssEs7qM0HAOAKlosN+Fft1FichPz6BMW Qy5vT993xruryP1K4YIpiurRSQ== X-Google-Smtp-Source: ABdhPJzPGHDciQEwwGYn6SA7tuSzITW/jpvDCAdmG2Rwvpoq4OojCjBJqR34AQ6PJX7D6Yu7YH2rag== X-Received: by 2002:a1c:3588:: with SMTP id c130mr3352791wma.94.1601476730147; Wed, 30 Sep 2020 07:38:50 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id m12sm2999403wml.38.2020.09.30.07.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 07:38:49 -0700 (PDT) Date: Wed, 30 Sep 2020 16:38:47 +0200 From: Daniel Vetter To: Peter Collingbourne Subject: Re: [PATCH v2] Partially revert "video: fbdev: amba-clcd: Retire elder CLCD driver" Message-ID: <20200930143847.GA438822@phenom.ffwll.local> References: <20200929195344.2219796-1-pcc@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200929195344.2219796-1-pcc@google.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200930_103852_008634_E3D15C5A X-CRM114-Status: GOOD ( 44.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Linus Walleij , Kevin Brodsky , Maarten Lankhorst , Russell King , ML dri-devel , Eric Anholt , John Stultz , Maxime Ripard , Daniel Vetter , Sean Paul , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Sep 29, 2020 at 12:53:44PM -0700, Peter Collingbourne wrote: > Also partially revert the follow-up change "drm: pl111: Absorb the > external register header". > > This reverts the parts of commits > 7e4e589db76a3cf4c1f534eb5a09cc6422766b93 and > 0fb8125635e8eb5483fb095f98dcf0651206a7b8 that touch paths outside > of drivers/gpu/drm/pl111. > > The fbdev driver is used by Android's FVP configuration. Using the > DRM driver together with DRM's fbdev emulation results in a failure > to boot Android. The root cause is that Android's generic fbdev > userspace driver relies on the ability to set the pixel format via > FBIOPUT_VSCREENINFO, which is not supported by fbdev emulation. > > There have been other less critical behavioral differences identified > between the fbdev driver and the DRM driver with fbdev emulation. The > DRM driver exposes different values for the panel's width, height and > refresh rate, and the DRM driver fails a FBIOPUT_VSCREENINFO syscall > with yres_virtual greater than the maximum supported value instead > of letting the syscall succeed and setting yres_virtual based on yres. > > Signed-off-by: Peter Collingbourne Applied to drm-misc-fixes, should make it into Linus tree this week. -Daniel > --- > View this change in Gerrit: https://linux-review.googlesource.com/q/I2d7e59b0e693d9fec206d40df190c5aa02844b56 > > MAINTAINERS | 5 + > drivers/video/fbdev/Kconfig | 20 + > drivers/video/fbdev/Makefile | 1 + > drivers/video/fbdev/amba-clcd.c | 986 ++++++++++++++++++++++++++++++++ > include/linux/amba/clcd-regs.h | 87 +++ > include/linux/amba/clcd.h | 290 ++++++++++ > 6 files changed, 1389 insertions(+) > create mode 100644 drivers/video/fbdev/amba-clcd.c > create mode 100644 include/linux/amba/clcd-regs.h > create mode 100644 include/linux/amba/clcd.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 190c7fa2ea01..671c1fa79e64 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1460,6 +1460,11 @@ S: Odd Fixes > F: drivers/amba/ > F: include/linux/amba/bus.h > > +ARM PRIMECELL CLCD PL110 DRIVER > +M: Russell King > +S: Odd Fixes > +F: drivers/video/fbdev/amba-clcd.* > + > ARM PRIMECELL KMI PL050 DRIVER > M: Russell King > S: Odd Fixes > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index b2c9dd4f0cb5..402e85450bb5 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -272,6 +272,26 @@ config FB_PM2_FIFO_DISCONNECT > help > Support the Permedia2 FIFO disconnect feature. > > +config FB_ARMCLCD > + tristate "ARM PrimeCell PL110 support" > + depends on ARM || ARM64 || COMPILE_TEST > + depends on FB && ARM_AMBA && HAS_IOMEM > + select FB_CFB_FILLRECT > + select FB_CFB_COPYAREA > + select FB_CFB_IMAGEBLIT > + select FB_MODE_HELPERS if OF > + select VIDEOMODE_HELPERS if OF > + select BACKLIGHT_CLASS_DEVICE if OF > + help > + This framebuffer device driver is for the ARM PrimeCell PL110 > + Colour LCD controller. ARM PrimeCells provide the building > + blocks for System on a Chip devices. > + > + If you want to compile this as a module (=code which can be > + inserted into and removed from the running kernel), say M > + here and read . The module > + will be called amba-clcd. > + > config FB_ACORN > bool "Acorn VIDC support" > depends on (FB = y) && ARM && ARCH_ACORN > diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile > index cad4fb64442a..a0705b99e643 100644 > --- a/drivers/video/fbdev/Makefile > +++ b/drivers/video/fbdev/Makefile > @@ -75,6 +75,7 @@ obj-$(CONFIG_FB_HIT) += hitfb.o > obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o > obj-$(CONFIG_FB_PVR2) += pvr2fb.o > obj-$(CONFIG_FB_VOODOO1) += sstfb.o > +obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o > obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o > obj-$(CONFIG_FB_68328) += 68328fb.o > obj-$(CONFIG_FB_GBE) += gbefb.o > diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c > new file mode 100644 > index 000000000000..b7682de412d8 > --- /dev/null > +++ b/drivers/video/fbdev/amba-clcd.c > @@ -0,0 +1,986 @@ > +/* > + * linux/drivers/video/amba-clcd.c > + * > + * Copyright (C) 2001 ARM Limited, by David A Rusling > + * Updated to 2.5, Deep Blue Solutions Ltd. > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file COPYING in the main directory of this archive > + * for more details. > + * > + * ARM PrimeCell PL110 Color LCD Controller > + */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include