* Re: [PATCH 2/2] video: imxfb: Add feature to setup PWM Contrast Control Register
From: Sascha Hauer @ 2013-07-26 7:38 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20130725212053.b39198a8610efc157a91b7be@mail.ru>
On Thu, Jul 25, 2013 at 09:20:53PM +0400, Alexander Shiyan wrote:
> On Thu, 25 Jul 2013 15:38:56 +0200
> Markus Pargmann <mpa@pengutronix.de> wrote:
>
> > Hi,
> >
> > On Sun, Jul 21, 2013 at 12:35:09PM +0400, Alexander Shiyan wrote:
> > > This patch adds feature to setup PWM Contrast Control Register.
> > > This register is used to control the signal output at the contrast pin,
> > > which controls contrast of the LCD panel.
> >
> > http://www.spinics.net/lists/linux-fbdev/msg10002.html
>
> PWM? I can not understand how the PWM driver will be connected to the
> framebuffer driver. It is not backlight, this is contrast.
> Even if we imagine that the driver will be connected through phandle,
> then we will need to have at least 4! additional parameters in the framebuffer
> driver: freq source, frequency and active pulse period + phandle to PWM.
> Is it worth it, given that these parameters should not be adjustable?
> On my opinion, the only one additional parameter in framebuffer is enough.
> Thanks.
Why should the contrast of a display not be adjustable?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH v3] video: xilinxfb: Fix compilation warning
From: Tomi Valkeinen @ 2013-07-26 7:35 UTC (permalink / raw)
To: Michal Simek
Cc: Jean-Christophe Plagniol-Villard, Jingoo Han, Geert Uytterhoeven,
Michal Simek, linux-fbdev, linux-kernel
In-Reply-To: <51F2262F.1020203@ti.com>
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
On 26/07/13 10:33, Tomi Valkeinen wrote:
> On 25/07/13 16:45, Michal Simek wrote:
>> regs_phys is phys_addr_t (u32 or u64).
>> Lets use %pa printk format specifier.
>>
>> Fixes compilation warning introduced by:
>> video: xilinxfb: Use drvdata->regs_phys instead of physaddr
>> (sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Thanks, I've applied this into my 3.12/fbdev branch.
Actually, let's put this into 3.11-fixes/fbdev branch.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply
* Re: [PATCH v3] video: xilinxfb: Fix compilation warning
From: Tomi Valkeinen @ 2013-07-26 7:33 UTC (permalink / raw)
To: Michal Simek
Cc: Jean-Christophe Plagniol-Villard, Jingoo Han, Geert Uytterhoeven,
Michal Simek, linux-fbdev, linux-kernel
In-Reply-To: <b8701d73538d37495b41ef465440a6d5f3018870.1374759923.git.michal.simek@xilinx.com>
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
On 25/07/13 16:45, Michal Simek wrote:
> regs_phys is phys_addr_t (u32 or u64).
> Lets use %pa printk format specifier.
>
> Fixes compilation warning introduced by:
> video: xilinxfb: Use drvdata->regs_phys instead of physaddr
> (sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> Changes in v3:
> - Fix commit message reported by Geert
>
> Changes in v2:
> - Use %pa instead of casting
>
> ppc44x_defconfig
> Fixes regressions in v3.11-rc2
>
> ---
> drivers/video/xilinxfb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
> index f3d4a69..6629b29 100644
> --- a/drivers/video/xilinxfb.c
> +++ b/drivers/video/xilinxfb.c
> @@ -341,8 +341,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
>
> if (drvdata->flags & BUS_ACCESS_FLAG) {
> /* Put a banner in the log (for DEBUG) */
> - dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
> - drvdata->regs);
> + dev_dbg(dev, "regs: phys=%pa, virt=%p\n",
> + &drvdata->regs_phys, drvdata->regs);
> }
> /* Put a banner in the log (for DEBUG) */
> dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
> --
> 1.8.2.3
>
Thanks, I've applied this into my 3.12/fbdev branch.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply
* Re: [PATCH V2] driver/vga16fb.c: remove the unused variable "dev" of function vga16fb_destroy()
From: Tomi Valkeinen @ 2013-07-26 7:31 UTC (permalink / raw)
To: Paul Bolle
Cc: Geert Uytterhoeven, Gu Zheng, Jean-Christophe PLAGNIOL-VILLARD,
Linux Fbdev development list, linux-kernel
In-Reply-To: <1374747739.29835.45.camel@x61.thuisdomein>
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
On 25/07/13 13:22, Paul Bolle wrote:
> On Thu, 2013-07-25 at 12:11 +0200, Geert Uytterhoeven wrote:
>> Please send a v3, which has the version info under the above "---",
>> instead of making it a part of the patch description to be committed.
>
> Grepping through my mail tells me this is the fourth time a patch has
> been submitted to fix this trivial issue. Perhaps (one of) the
> maintainers can indicate which patch, if any, the maintainers have taken
> or will be taking.
I took the the oldest patch for this in my mailbox, from Luis.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply
* Re: [PATCH] vga16fb: Remove unused variable
From: Tomi Valkeinen @ 2013-07-26 7:30 UTC (permalink / raw)
To: Luis Henriques
Cc: linux-fbdev, Jean-Christophe Plagniol-Villard, linux-kernel
In-Reply-To: <20130710225659.GA14107@hercules>
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
On 11/07/13 01:57, Luis Henriques wrote:
> Fix build warning of unused variable:
>
> drivers/video/vga16fb.c:1268:26: warning: unused variable ‘dev’ [-Wunused-variable]
>
> Signed-off-by: Luis Henriques<luis.henriques@canonical.com>
> ---
> drivers/video/vga16fb.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
> index 830ded4..2827333 100644
> --- a/drivers/video/vga16fb.c
> +++ b/drivers/video/vga16fb.c
> @@ -1265,7 +1265,6 @@ static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image
>
> static void vga16fb_destroy(struct fb_info *info)
> {
> - struct platform_device *dev = container_of(info->device, struct platform_device, dev);
> iounmap(info->screen_base);
> fb_dealloc_cmap(&info->cmap);
> /* XXX unshare VGA regions */
>
Thanks, I've applied this into my 3.12/fbdev branch.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply
* Re: [PATCHv2 3/3] fb: backlight: HX8357: Add HX8369 support
From: Jingoo Han @ 2013-07-25 23:52 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374757513-2253-4-git-send-email-maxime.ripard@free-electrons.com>
On Thursday, July 25, 2013 10:05 PM, Maxime Ripard wrote:
>
> From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>
> Add support for the Himax HX8369 controller as it is quite similar to the
> hx8357.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Acked-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/video/backlight/hx8357.c | 221 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 206 insertions(+), 15 deletions(-)
>
[....]
> + ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
> + if (ret < 0)
> + return ret;
> +
> + msleep(100);
Hi Maxime Ripard,
Could you add comment on this huge delay, too?
Best regards,
Jingoo Han
^ permalink raw reply
* Re: [PATCHv2 2/3] video: hx8357: Make IM pins optional
From: Jingoo Han @ 2013-07-25 23:47 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374757513-2253-3-git-send-email-maxime.ripard@free-electrons.com>
On Thursday, July 25, 2013 10:05 PM, Maxime Ripard wrote:
>
> The IM pins of the HX8357 controller are used to define the interface
> used to feed pixel stream to the LCD panel.
>
> Most of the time, these pins are directly routed to either the ground or
> the VCC to set their values.
>
> Remove the need to assign GPIOs to these pins when we are in such a case.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/video/backlight/hx8357.c | 53 +++++++++++++++++++++++-----------------
> 1 file changed, 31 insertions(+), 22 deletions(-)
>
[.....]
> + if (of_find_property(spi->dev.of_node, "im-gpios", NULL)) {
> + lcd->use_im_pins = 1;
> +
> + for (i = 0; i < HX8357_NUM_IM_PINS; i++) {
> + lcd->im_pins[i] = of_get_named_gpio(spi->dev.of_node,
> + "im-gpios", i);
> + if (lcd->im_pins[i] = -EPROBE_DEFER) {
> + dev_info(&spi->dev, "GPIO requested is not here yet, deferring the
> probe\n");
> + return -EPROBE_DEFER;
> + }
> + if (!gpio_is_valid(lcd->im_pins[i])) {
> + dev_err(&spi->dev, "Missing dt property: im-gpios\n");
> + return -EINVAL;
> + }
> +
> + ret = devm_gpio_request_one(&spi->dev, lcd->im_pins[i],
> + GPIOF_OUT_INIT_LOW,
> + "im_pins");
> + if (ret) {
> + dev_err(&spi->dev, "failed to request gpio %d: %d\n",
> + lcd->im_pins[i], ret);
> + return -EINVAL;
> + }
> }
> -
> - ret = devm_gpio_request_one(&spi->dev, lcd->im_pins[i],
> - GPIOF_OUT_INIT_LOW, "im_pins");
> - if (ret) {
> - dev_err(&spi->dev, "failed to request gpio %d: %d\n",
> - lcd->im_pins[i], ret);
> - return -EINVAL;
> - }
> - }
> + } else
> + lcd->use_im_pins = 0;
According to the 'Documentation/CodingStyle', braces are necessary as below.
} else {
lcd->use_im_pins = 0;
}
Others look good.
Acked-by: Jingoo Han <jg1.han@samsung.com>
Best regards,
Jingoo Han
^ permalink raw reply
* Re: [PATCH v3] video: xilinxfb: Fix compilation warning
From: Jingoo Han @ 2013-07-25 23:14 UTC (permalink / raw)
To: 'Michal Simek',
'Jean-Christophe Plagniol-Villard'
Cc: 'Michal Simek', 'Tomi Valkeinen', linux-fbdev,
linux-kernel, 'Geert Uytterhoeven', Jingoo Han
In-Reply-To: <b8701d73538d37495b41ef465440a6d5f3018870.1374759923.git.michal.simek@xilinx.com>
On Thursday, July 25, 2013 10:45 PM, Michal Simek wrote:
>
> regs_phys is phys_addr_t (u32 or u64).
> Lets use %pa printk format specifier.
>
> Fixes compilation warning introduced by:
> video: xilinxfb: Use drvdata->regs_phys instead of physaddr
> (sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
It looks good.
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Best regards,
Jingoo Han
> ---
> Changes in v3:
> - Fix commit message reported by Geert
>
> Changes in v2:
> - Use %pa instead of casting
>
> ppc44x_defconfig
> Fixes regressions in v3.11-rc2
>
> ---
> drivers/video/xilinxfb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
> index f3d4a69..6629b29 100644
> --- a/drivers/video/xilinxfb.c
> +++ b/drivers/video/xilinxfb.c
> @@ -341,8 +341,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
>
> if (drvdata->flags & BUS_ACCESS_FLAG) {
> /* Put a banner in the log (for DEBUG) */
> - dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
> - drvdata->regs);
> + dev_dbg(dev, "regs: phys=%pa, virt=%p\n",
> + &drvdata->regs_phys, drvdata->regs);
> }
> /* Put a banner in the log (for DEBUG) */
> dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
> --
> 1.8.2.3
>
^ permalink raw reply
* Re: [RFC 0/1] drm/pl111: Initial drm/kms driver for pl111
From: Rob Clark @ 2013-07-25 18:21 UTC (permalink / raw)
To: tom.cooksey; +Cc: linux-arm-kernel, linux-fbdev, pawel.moll, dri-devel
In-Reply-To: <1374772648-19151-1-git-send-email-tom.cooksey@arm.com>
On Thu, Jul 25, 2013 at 1:17 PM, <tom.cooksey@arm.com> wrote:
> From: Tom Cooksey <tom.cooksey@arm.com>
>
> Please find below the current state of our pl111 DRM/KMS driver. This
> is lightly tested on a Versatile Express using X running the
> xf86-video-armsoc DDX driver[i] with the patches applied to drm-next
> as of ~last week. To actually see anything on the DVI output, you
> must also apply Pawel Moll's VExpress DVI mux driver[ii] to select
> the video signal from the ca9x4 core tile.
>
> [i] <https://git.linaro.org/gitweb?p=arm/xorg/driver/xf86-video-armsoc.git;a=summary>
> [ii] <https://patchwork.kernel.org/patch/1765981/>
>
>
> Known issues:
> * It uses KDS. We intend to switch to whatever implicit per-buffer
> synchronisation mechanism gets merged, once something is merged.
> * It abuses flags parameter of DRM_IOCTL_MODE_CREATE_DUMB to also
> allocate buffers for the GPU. Still not sure how to resolve this
> as we don't use DRM for our GPU driver.
any thoughts/plans about a DRM GPU driver? Ideally long term (esp.
once the dma-fence stuff is in place), we'd have gpu-specific drm
(gpu-only, no kms) driver, and SoC/display specific drm/kms driver,
using prime/dmabuf to share between the two.
> * Doesn't handle page flip event sequence numbers and timestamps
> * The v_sync handling needs work in general - a work queue is a
> little overkill
> * Doesn't support the import half of PRIME properly, only export
> * Need to validate src rectangle size in
> pl111_drm_cursor_plane_update()
> * Only supports 640x480 mode, which is hard-coded. We intend to
> rebase on top of CDF once it is merged, which hopefully will
> handle a lot of the EDID parsing & mode setting for us (once
> Pawel's CDF patches for VExpress also land).
note that drm core already handles EDID parsing quite nicely.. I'm not
entirely sure why CDF would be needed for this?
>
> I appreciate that's a fairly hefty list of known issues already!
> However, we're waiting for both CDF & dma_buf sync mechanisms to land
> before we can address some of those. So in the mean-time, I thought
> someone might be interested in taking a look at what we have so far,
> which is why I'm posting this now. Needless to say the code will need
> to be refactored a fair bit, however I'm keen to get and additional
> feedback anyone cares to give.
>
What is the dependency on CDF? Is there an external encoder/bridge
that could be shared between platforms?
btw, I think that having some share-able KMS objects is a good idea.
I'm not entirely sure that the directions that the current CDF
proposals are headed is necessarily the right way forward. I'd prefer
to see small/incremental evolution of KMS (ie. add drm_bridge and
drm_panel, and refactor the existing encoder-slave). Keeping it
inside drm means that we can evolve it more easily, and avoid layers
of glue code for no good reason.
BR,
-R
>
> Cheers,
>
> Tom
>
> Tom Cooksey (1):
> drm/pl111: Initial drm/kms driver for pl111 display controller
>
> drivers/gpu/drm/Kconfig | 2 +
> drivers/gpu/drm/Makefile | 1 +
> drivers/gpu/drm/pl111/Kbuild | 14 +
> drivers/gpu/drm/pl111/Kconfig | 9 +
> drivers/gpu/drm/pl111/pl111_clcd_ext.h | 78 ++++
> drivers/gpu/drm/pl111/pl111_drm.h | 227 ++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_connector.c | 166 +++++++++
> drivers/gpu/drm/pl111/pl111_drm_crtc.c | 432 ++++++++++++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_cursor.c | 97 +++++
> drivers/gpu/drm/pl111/pl111_drm_device.c | 319 +++++++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_dma_buf.c | 339 ++++++++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_encoder.c | 106 ++++++
> drivers/gpu/drm/pl111/pl111_drm_fb.c | 152 ++++++++
> drivers/gpu/drm/pl111/pl111_drm_funcs.h | 127 +++++++
> drivers/gpu/drm/pl111/pl111_drm_gem.c | 287 +++++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_pl111.c | 513 +++++++++++++++++++++++++++
> drivers/gpu/drm/pl111/pl111_drm_platform.c | 150 ++++++++
> drivers/gpu/drm/pl111/pl111_drm_suspend.c | 35 ++
> drivers/gpu/drm/pl111/pl111_drm_vma.c | 214 +++++++++++
> 19 files changed, 3268 insertions(+)
> create mode 100644 drivers/gpu/drm/pl111/Kbuild
> create mode 100644 drivers/gpu/drm/pl111/Kconfig
> create mode 100644 drivers/gpu/drm/pl111/pl111_clcd_ext.h
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm.h
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_connector.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_crtc.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_cursor.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_device.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_dma_buf.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_encoder.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_fb.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_funcs.h
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_gem.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_pl111.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_platform.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_suspend.c
> create mode 100644 drivers/gpu/drm/pl111/pl111_drm_vma.c
>
> --
> 1.7.9.5
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH 2/2] video: imxfb: Add feature to setup PWM Contrast Control Register
From: Alexander Shiyan @ 2013-07-25 17:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20130725133824.GD16871@s25.your-server.de>
On Thu, 25 Jul 2013 15:38:56 +0200
Markus Pargmann <mpa@pengutronix.de> wrote:
> Hi,
>
> On Sun, Jul 21, 2013 at 12:35:09PM +0400, Alexander Shiyan wrote:
> > This patch adds feature to setup PWM Contrast Control Register.
> > This register is used to control the signal output at the contrast pin,
> > which controls contrast of the LCD panel.
>
> http://www.spinics.net/lists/linux-fbdev/msg10002.html
PWM? I can not understand how the PWM driver will be connected to the
framebuffer driver. It is not backlight, this is contrast.
Even if we imagine that the driver will be connected through phandle,
then we will need to have at least 4! additional parameters in the framebuffer
driver: freq source, frequency and active pulse period + phandle to PWM.
Is it worth it, given that these parameters should not be adjustable?
On my opinion, the only one additional parameter in framebuffer is enough.
Thanks.
[...]
> > ---
> > Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
> > drivers/video/imxfb.c | 2 +-
> > 2 files changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> > index 46da08d..be10c65 100644
> > --- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> > +++ b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> > @@ -18,6 +18,7 @@ Optional properties:
> > - fsl,dmacr: DMA Control Register value. This is optional. By default, the
> > register is not modified as recommended by the datasheet.
> > - fsl,lscr1: LCDC Sharp Configuration Register value.
> > +- fsl,pwmr: LCDC PWM Contrast Control Register value.
> >
> > Example:
> >
> > diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
> > index 8e104c4..d98299a 100644
> > --- a/drivers/video/imxfb.c
> > +++ b/drivers/video/imxfb.c
> > @@ -806,8 +806,8 @@ static int imxfb_init_fbinfo(struct platform_device *pdev,
> >
> > fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
> > of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
> > -
> > of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
> > + of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
> >
> > /* These two function pointers could be used by some specific
> > * platforms. */
> > --
--
Alexander Shiyan <shc_work@mail.ru>
^ permalink raw reply
* [RFC 0/1] drm/pl111: Initial drm/kms driver for pl111
From: tom.cooksey @ 2013-07-25 17:17 UTC (permalink / raw)
To: dri-devel; +Cc: linux-fbdev, pawel.moll, linux-arm-kernel, Tom Cooksey
From: Tom Cooksey <tom.cooksey@arm.com>
Please find below the current state of our pl111 DRM/KMS driver. This
is lightly tested on a Versatile Express using X running the
xf86-video-armsoc DDX driver[i] with the patches applied to drm-next
as of ~last week. To actually see anything on the DVI output, you
must also apply Pawel Moll's VExpress DVI mux driver[ii] to select
the video signal from the ca9x4 core tile.
[i] <https://git.linaro.org/gitweb?p=arm/xorg/driver/xf86-video-armsoc.git;a=summary>
[ii] <https://patchwork.kernel.org/patch/1765981/>
Known issues:
* It uses KDS. We intend to switch to whatever implicit per-buffer
synchronisation mechanism gets merged, once something is merged.
* It abuses flags parameter of DRM_IOCTL_MODE_CREATE_DUMB to also
allocate buffers for the GPU. Still not sure how to resolve this
as we don't use DRM for our GPU driver.
* Doesn't handle page flip event sequence numbers and timestamps
* The v_sync handling needs work in general - a work queue is a
little overkill
* Doesn't support the import half of PRIME properly, only export
* Need to validate src rectangle size in
pl111_drm_cursor_plane_update()
* Only supports 640x480 mode, which is hard-coded. We intend to
rebase on top of CDF once it is merged, which hopefully will
handle a lot of the EDID parsing & mode setting for us (once
Pawel's CDF patches for VExpress also land).
I appreciate that's a fairly hefty list of known issues already!
However, we're waiting for both CDF & dma_buf sync mechanisms to land
before we can address some of those. So in the mean-time, I thought
someone might be interested in taking a look at what we have so far,
which is why I'm posting this now. Needless to say the code will need
to be refactored a fair bit, however I'm keen to get and additional
feedback anyone cares to give.
Cheers,
Tom
Tom Cooksey (1):
drm/pl111: Initial drm/kms driver for pl111 display controller
drivers/gpu/drm/Kconfig | 2 +
drivers/gpu/drm/Makefile | 1 +
drivers/gpu/drm/pl111/Kbuild | 14 +
drivers/gpu/drm/pl111/Kconfig | 9 +
drivers/gpu/drm/pl111/pl111_clcd_ext.h | 78 ++++
drivers/gpu/drm/pl111/pl111_drm.h | 227 ++++++++++++
drivers/gpu/drm/pl111/pl111_drm_connector.c | 166 +++++++++
drivers/gpu/drm/pl111/pl111_drm_crtc.c | 432 ++++++++++++++++++++++
drivers/gpu/drm/pl111/pl111_drm_cursor.c | 97 +++++
drivers/gpu/drm/pl111/pl111_drm_device.c | 319 +++++++++++++++++
drivers/gpu/drm/pl111/pl111_drm_dma_buf.c | 339 ++++++++++++++++++
drivers/gpu/drm/pl111/pl111_drm_encoder.c | 106 ++++++
drivers/gpu/drm/pl111/pl111_drm_fb.c | 152 ++++++++
drivers/gpu/drm/pl111/pl111_drm_funcs.h | 127 +++++++
drivers/gpu/drm/pl111/pl111_drm_gem.c | 287 +++++++++++++++
drivers/gpu/drm/pl111/pl111_drm_pl111.c | 513 +++++++++++++++++++++++++++
drivers/gpu/drm/pl111/pl111_drm_platform.c | 150 ++++++++
drivers/gpu/drm/pl111/pl111_drm_suspend.c | 35 ++
drivers/gpu/drm/pl111/pl111_drm_vma.c | 214 +++++++++++
19 files changed, 3268 insertions(+)
create mode 100644 drivers/gpu/drm/pl111/Kbuild
create mode 100644 drivers/gpu/drm/pl111/Kconfig
create mode 100644 drivers/gpu/drm/pl111/pl111_clcd_ext.h
create mode 100644 drivers/gpu/drm/pl111/pl111_drm.h
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_connector.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_crtc.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_cursor.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_device.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_dma_buf.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_encoder.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_fb.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_funcs.h
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_gem.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_pl111.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_platform.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_suspend.c
create mode 100644 drivers/gpu/drm/pl111/pl111_drm_vma.c
--
1.7.9.5
^ permalink raw reply
* [PATCH] Release efifb's colormap in efifb_destroy()
From: Peter Jones @ 2013-07-25 15:48 UTC (permalink / raw)
To: Catalin Marinas
Cc: Alexandra N. Kossovsky, linux-fbdev, linux-kernel, Peter Jones
In-Reply-To: <CAHkRjk4Ansh+Xr+cPQNacwx=aOb65_hW_MNRx5QVtatJCz5tqg@mail.gmail.com>
This was found by Alexandra Kossovsky, who noted this traceback from
kmemleak:
> unreferenced object 0xffff880216fcfe00 (size 512):
> comm "swapper/0", pid 1, jiffies 4294895429 (age 1415.320s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 aa aa aa aa aa aa aa aa ................
> 55 55 55 55 55 55 55 55 ff ff ff ff ff ff ff ff UUUUUUUU........
> backtrace:
> [<ffffffff813e415c>] kmemleak_alloc+0x21/0x3e
> [<ffffffff8111c17f>]
> kmemleak_alloc_recursive.constprop.57+0x16/0x18
> [<ffffffff8111e63b>] __kmalloc+0xf9/0x144
> [<ffffffff8123d9cf>] fb_alloc_cmap_gfp+0x47/0xe1
> [<ffffffff8123da77>] fb_alloc_cmap+0xe/0x10
> [<ffffffff81aff40a>] efifb_probe+0x3e9/0x48f
> [<ffffffff812c566f>] platform_drv_probe+0x34/0x5e
> [<ffffffff812c3e6d>] driver_probe_device+0x98/0x1b4
> [<ffffffff812c3fd7>] __driver_attach+0x4e/0x6f
> [<ffffffff812c25bf>] bus_for_each_dev+0x57/0x8a
> [<ffffffff812c3984>] driver_attach+0x19/0x1b
> [<ffffffff812c362b>] bus_add_driver+0xde/0x201
> [<ffffffff812c453f>] driver_register+0x8c/0x110
> [<ffffffff812c510d>] platform_driver_register+0x41/0x43
> [<ffffffff812c5127>] platform_driver_probe+0x18/0x8a
> [<ffffffff81aff002>] efifb_init+0x276/0x295
---
drivers/video/efifb.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index 390b61b..1f3eab3 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -289,6 +289,7 @@ static void efifb_destroy(struct fb_info *info)
if (request_mem_succeeded)
release_mem_region(info->apertures->ranges[0].base,
info->apertures->ranges[0].size);
+ fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
}
--
1.8.3.1
^ permalink raw reply related
* Re: kmemleak warning in efifb_probe
From: Peter Jones @ 2013-07-25 15:47 UTC (permalink / raw)
To: Catalin Marinas
Cc: Alexandra N. Kossovsky, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, linux-fbdev, Linux Kernel Mailing List
In-Reply-To: <CAHkRjk4Ansh+Xr+cPQNacwx=aOb65_hW_MNRx5QVtatJCz5tqg@mail.gmail.com>
On Thu, Jul 25, 2013 at 01:18:31PM +0100, Catalin Marinas wrote:
> On 21 July 2013 16:11, Alexandra N. Kossovsky
> <Alexandra.Kossovsky@oktetlabs.ru> wrote:
> > I am running linux-3.10.0 with kmemleak and see following warnings
> > in /sys/kernel/debug/kmemleak:
> >
> > unreferenced object 0xffff880216fcfe00 (size 512):
> > comm "swapper/0", pid 1, jiffies 4294895429 (age 1415.320s)
> > hex dump (first 32 bytes):
> > 00 00 00 00 00 00 00 00 aa aa aa aa aa aa aa aa ................
> > 55 55 55 55 55 55 55 55 ff ff ff ff ff ff ff ff UUUUUUUU........
> > backtrace:
> > [<ffffffff813e415c>] kmemleak_alloc+0x21/0x3e
> > [<ffffffff8111c17f>] kmemleak_alloc_recursive.constprop.57+0x16/0x18
> > [<ffffffff8111e63b>] __kmalloc+0xf9/0x144
> > [<ffffffff8123d9cf>] fb_alloc_cmap_gfp+0x47/0xe1
> > [<ffffffff8123da77>] fb_alloc_cmap+0xe/0x10
> > [<ffffffff81aff40a>] efifb_probe+0x3e9/0x48f
> > [<ffffffff812c566f>] platform_drv_probe+0x34/0x5e
> > [<ffffffff812c3e6d>] driver_probe_device+0x98/0x1b4
> > [<ffffffff812c3fd7>] __driver_attach+0x4e/0x6f
> > [<ffffffff812c25bf>] bus_for_each_dev+0x57/0x8a
> > [<ffffffff812c3984>] driver_attach+0x19/0x1b
> > [<ffffffff812c362b>] bus_add_driver+0xde/0x201
> > [<ffffffff812c453f>] driver_register+0x8c/0x110
> > [<ffffffff812c510d>] platform_driver_register+0x41/0x43
> > [<ffffffff812c5127>] platform_driver_probe+0x18/0x8a
> > [<ffffffff81aff002>] efifb_init+0x276/0x295
>
> Does the efifb driver has any way to deallocate the cmap? I don't see
> any explicit call to fb_dealloc_cmap() apart from the error handling.
> My theory is that the efifb driver gets deregistered via
> do_remove_conflicting_framebuffers(). I'm not familiar with this code,
> just commenting from a kmemleak perspective.
You're right, that's the typical deregister path. I'll follow up with a
patch to test.
--
Peter
^ permalink raw reply
* [PATCH v3] video: xilinxfb: Fix compilation warning
From: Michal Simek @ 2013-07-25 13:45 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Jingoo Han, Geert Uytterhoeven
Cc: Michal Simek, Tomi Valkeinen, linux-fbdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]
regs_phys is phys_addr_t (u32 or u64).
Lets use %pa printk format specifier.
Fixes compilation warning introduced by:
video: xilinxfb: Use drvdata->regs_phys instead of physaddr
(sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v3:
- Fix commit message reported by Geert
Changes in v2:
- Use %pa instead of casting
ppc44x_defconfig
Fixes regressions in v3.11-rc2
---
drivers/video/xilinxfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index f3d4a69..6629b29 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -341,8 +341,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
if (drvdata->flags & BUS_ACCESS_FLAG) {
/* Put a banner in the log (for DEBUG) */
- dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
- drvdata->regs);
+ dev_dbg(dev, "regs: phys=%pa, virt=%p\n",
+ &drvdata->regs_phys, drvdata->regs);
}
/* Put a banner in the log (for DEBUG) */
dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related
* Re: [PATCH v2] video: xilinxfb: Fix compilation warning
From: Michal Simek @ 2013-07-25 13:43 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Michal Simek, Jean-Christophe Plagniol-Villard, Jingoo Han,
Tomi Valkeinen, Linux Fbdev development list,
linux-kernel@vger.kernel.org
In-Reply-To: <CAMuHMdX2mKANduZO9HaBHRZ13V0PztOc-uYxTymUsH8-NE5FEQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
On 07/25/2013 03:36 PM, Geert Uytterhoeven wrote:
> On Thu, Jul 25, 2013 at 1:21 PM, Michal Simek <michal.simek@xilinx.com> wrote:
>> regs_phys is phys_addr_t (u32 or u64).
>> Lets retype it to u64.
>
> This no longer matches the actual patch?
I need some holidays.
Will send v3.
Sorry,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] video: imxfb: Add feature to setup PWM Contrast Control Register
From: Markus Pargmann @ 2013-07-25 13:38 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374395709-20898-2-git-send-email-shc_work@mail.ru>
Hi,
On Sun, Jul 21, 2013 at 12:35:09PM +0400, Alexander Shiyan wrote:
> This patch adds feature to setup PWM Contrast Control Register.
> This register is used to control the signal output at the contrast pin,
> which controls contrast of the LCD panel.
http://www.spinics.net/lists/linux-fbdev/msg10002.html
Regards,
Markus
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
> drivers/video/imxfb.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> index 46da08d..be10c65 100644
> --- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> +++ b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
> @@ -18,6 +18,7 @@ Optional properties:
> - fsl,dmacr: DMA Control Register value. This is optional. By default, the
> register is not modified as recommended by the datasheet.
> - fsl,lscr1: LCDC Sharp Configuration Register value.
> +- fsl,pwmr: LCDC PWM Contrast Control Register value.
>
> Example:
>
> diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
> index 8e104c4..d98299a 100644
> --- a/drivers/video/imxfb.c
> +++ b/drivers/video/imxfb.c
> @@ -806,8 +806,8 @@ static int imxfb_init_fbinfo(struct platform_device *pdev,
>
> fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
> of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
> -
> of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
> + of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
>
> /* These two function pointers could be used by some specific
> * platforms. */
> --
> 1.8.1.5
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH v2] video: xilinxfb: Fix compilation warning
From: Geert Uytterhoeven @ 2013-07-25 13:36 UTC (permalink / raw)
To: Michal Simek
Cc: Jean-Christophe Plagniol-Villard, Jingoo Han, Michal Simek,
Tomi Valkeinen, Linux Fbdev development list,
linux-kernel@vger.kernel.org
In-Reply-To: <204d93f8a9dffef6ff00d961f91be0b465f21841.1374751310.git.michal.simek@xilinx.com>
On Thu, Jul 25, 2013 at 1:21 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> regs_phys is phys_addr_t (u32 or u64).
> Lets retype it to u64.
This no longer matches the actual patch?
> Fixes compilation warning introduced by:
> video: xilinxfb: Use drvdata->regs_phys instead of physaddr
> (sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> Changes in v2:
> - Use %pa instead of casting
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* [PATCHv2 3/3] fb: backlight: HX8357: Add HX8369 support
From: Maxime Ripard @ 2013-07-25 13:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374757513-2253-1-git-send-email-maxime.ripard@free-electrons.com>
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Add support for the Himax HX8369 controller as it is quite similar to the
hx8357.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/hx8357.c | 221 ++++++++++++++++++++++++++++++++++++---
1 file changed, 206 insertions(+), 15 deletions(-)
diff --git a/drivers/video/backlight/hx8357.c b/drivers/video/backlight/hx8357.c
index 00614ce..58ed4c1 100644
--- a/drivers/video/backlight/hx8357.c
+++ b/drivers/video/backlight/hx8357.c
@@ -71,6 +71,18 @@
#define HX8357_SET_POWER_NORMAL 0xd2
#define HX8357_SET_PANEL_RELATED 0xe9
+#define HX8369_SET_DISPLAY_BRIGHTNESS 0x51
+#define HX8369_WRITE_CABC_DISPLAY_VALUE 0x53
+#define HX8369_WRITE_CABC_BRIGHT_CTRL 0x55
+#define HX8369_WRITE_CABC_MIN_BRIGHTNESS 0x5e
+#define HX8369_SET_POWER 0xb1
+#define HX8369_SET_DISPLAY_MODE 0xb2
+#define HX8369_SET_DISPLAY_WAVEFORM_CYC 0xb4
+#define HX8369_SET_VCOM 0xb6
+#define HX8369_SET_EXTENSION_COMMAND 0xb9
+#define HX8369_SET_GIP 0xd5
+#define HX8369_SET_GAMMA_CURVE_RELATED 0xe0
+
struct hx8357_data {
unsigned im_pins[HX8357_NUM_IM_PINS];
unsigned reset;
@@ -144,6 +156,61 @@ static u8 hx8357_seq_display_mode[] = {
HX8357_SET_DISPLAY_MODE_RGB_INTERFACE,
};
+static u8 hx8369_seq_write_CABC_min_brightness[] = {
+ HX8369_WRITE_CABC_MIN_BRIGHTNESS, 0x00,
+};
+
+static u8 hx8369_seq_write_CABC_control[] = {
+ HX8369_WRITE_CABC_DISPLAY_VALUE, 0x24,
+};
+
+static u8 hx8369_seq_set_display_brightness[] = {
+ HX8369_SET_DISPLAY_BRIGHTNESS, 0xFF,
+};
+
+static u8 hx8369_seq_write_CABC_control_setting[] = {
+ HX8369_WRITE_CABC_BRIGHT_CTRL, 0x02,
+};
+
+static u8 hx8369_seq_extension_command[] = {
+ HX8369_SET_EXTENSION_COMMAND, 0xff, 0x83, 0x69,
+};
+
+static u8 hx8369_seq_display_related[] = {
+ HX8369_SET_DISPLAY_MODE, 0x00, 0x2b, 0x03, 0x03, 0x70, 0x00,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x01,
+};
+
+static u8 hx8369_seq_panel_waveform_cycle[] = {
+ HX8369_SET_DISPLAY_WAVEFORM_CYC, 0x0a, 0x1d, 0x80, 0x06, 0x02,
+};
+
+static u8 hx8369_seq_set_address_mode[] = {
+ HX8357_SET_ADDRESS_MODE, 0x00,
+};
+
+static u8 hx8369_seq_vcom[] = {
+ HX8369_SET_VCOM, 0x3e, 0x3e,
+};
+
+static u8 hx8369_seq_gip[] = {
+ HX8369_SET_GIP, 0x00, 0x01, 0x03, 0x25, 0x01, 0x02, 0x28, 0x70,
+ 0x11, 0x13, 0x00, 0x00, 0x40, 0x26, 0x51, 0x37, 0x00, 0x00, 0x71,
+ 0x35, 0x60, 0x24, 0x07, 0x0f, 0x04, 0x04,
+};
+
+static u8 hx8369_seq_power[] = {
+ HX8369_SET_POWER, 0x01, 0x00, 0x34, 0x03, 0x00, 0x11, 0x11, 0x32,
+ 0x2f, 0x3f, 0x3f, 0x01, 0x3a, 0x01, 0xe6, 0xe6, 0xe6, 0xe6, 0xe6,
+};
+
+static u8 hx8369_seq_gamma_curve_related[] = {
+ HX8369_SET_GAMMA_CURVE_RELATED, 0x00, 0x0d, 0x19, 0x2f, 0x3b, 0x3d,
+ 0x2e, 0x4a, 0x08, 0x0e, 0x0f, 0x14, 0x16, 0x14, 0x14, 0x14, 0x1e,
+ 0x00, 0x0d, 0x19, 0x2f, 0x3b, 0x3d, 0x2e, 0x4a, 0x08, 0x0e, 0x0f,
+ 0x14, 0x16, 0x14, 0x14, 0x14, 0x1e,
+};
+
static int hx8357_spi_write_then_read(struct lcd_device *lcdev,
u8 *txbuf, u16 txlen,
u8 *rxbuf, u16 rxlen)
@@ -220,6 +287,10 @@ static int hx8357_enter_standby(struct lcd_device *lcdev)
if (ret < 0)
return ret;
+ /*
+ * The controller needs 120ms when entering in sleep mode before we can
+ * send the command to go off sleep mode
+ */
msleep(120);
return 0;
@@ -233,6 +304,10 @@ static int hx8357_exit_standby(struct lcd_device *lcdev)
if (ret < 0)
return ret;
+ /*
+ * The controller needs 120ms when exiting from sleep mode before we
+ * can send the command to enter in sleep mode
+ */
msleep(120);
ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
@@ -242,6 +317,21 @@ static int hx8357_exit_standby(struct lcd_device *lcdev)
return 0;
}
+static void hx8357_lcd_reset(struct lcd_device *lcdev)
+{
+ struct hx8357_data *lcd = lcd_get_data(lcdev);
+
+ /* Reset the screen */
+ gpio_set_value(lcd->reset, 1);
+ usleep_range(10000, 12000);
+ gpio_set_value(lcd->reset, 0);
+ usleep_range(10000, 12000);
+ gpio_set_value(lcd->reset, 1);
+
+ /* The controller needs 120ms to recover from reset */
+ msleep(120);
+}
+
static int hx8357_lcd_init(struct lcd_device *lcdev)
{
struct hx8357_data *lcd = lcd_get_data(lcdev);
@@ -257,14 +347,6 @@ static int hx8357_lcd_init(struct lcd_device *lcdev)
gpio_set_value_cansleep(lcd->im_pins[2], 1);
}
- /* Reset the screen */
- gpio_set_value(lcd->reset, 1);
- usleep_range(10000, 12000);
- gpio_set_value(lcd->reset, 0);
- usleep_range(10000, 12000);
- gpio_set_value(lcd->reset, 1);
- msleep(120);
-
ret = hx8357_spi_write_array(lcdev, hx8357_seq_power,
ARRAY_SIZE(hx8357_seq_power));
if (ret < 0)
@@ -344,6 +426,9 @@ static int hx8357_lcd_init(struct lcd_device *lcdev)
if (ret < 0)
return ret;
+ /*
+ * The controller needs 120ms to fully recover from exiting sleep mode
+ */
msleep(120);
ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
@@ -359,6 +444,98 @@ static int hx8357_lcd_init(struct lcd_device *lcdev)
return 0;
}
+static int hx8369_lcd_init(struct lcd_device *lcdev)
+{
+ int ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_extension_command,
+ ARRAY_SIZE(hx8369_seq_extension_command));
+ if (ret < 0)
+ return ret;
+ usleep_range(10000, 12000);
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_display_related,
+ ARRAY_SIZE(hx8369_seq_display_related));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_panel_waveform_cycle,
+ ARRAY_SIZE(hx8369_seq_panel_waveform_cycle));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_set_address_mode,
+ ARRAY_SIZE(hx8369_seq_set_address_mode));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_vcom,
+ ARRAY_SIZE(hx8369_seq_vcom));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_gip,
+ ARRAY_SIZE(hx8369_seq_gip));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_power,
+ ARRAY_SIZE(hx8369_seq_power));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_byte(lcdev, HX8357_EXIT_SLEEP_MODE);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * The controller needs 120ms to fully recover from exiting sleep mode
+ */
+ msleep(120);
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_gamma_curve_related,
+ ARRAY_SIZE(hx8369_seq_gamma_curve_related));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_byte(lcdev, HX8357_EXIT_SLEEP_MODE);
+ if (ret < 0)
+ return ret;
+ usleep_range(1000, 1200);
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_write_CABC_control,
+ ARRAY_SIZE(hx8369_seq_write_CABC_control));
+ if (ret < 0)
+ return ret;
+ usleep_range(10000, 12000);
+
+ ret = hx8357_spi_write_array(lcdev,
+ hx8369_seq_write_CABC_control_setting,
+ ARRAY_SIZE(hx8369_seq_write_CABC_control_setting));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_array(lcdev,
+ hx8369_seq_write_CABC_min_brightness,
+ ARRAY_SIZE(hx8369_seq_write_CABC_min_brightness));
+ if (ret < 0)
+ return ret;
+ usleep_range(10000, 12000);
+
+ ret = hx8357_spi_write_array(lcdev, hx8369_seq_set_display_brightness,
+ ARRAY_SIZE(hx8369_seq_set_display_brightness));
+ if (ret < 0)
+ return ret;
+
+ ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
+ if (ret < 0)
+ return ret;
+
+ msleep(100);
+
+ return 0;
+}
+
#define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL)
static int hx8357_set_power(struct lcd_device *lcdev, int power)
@@ -391,10 +568,24 @@ static struct lcd_ops hx8357_ops = {
.get_power = hx8357_get_power,
};
+static const struct of_device_id hx8357_dt_ids[] = {
+ {
+ .compatible = "himax,hx8357",
+ .data = hx8357_lcd_init,
+ },
+ {
+ .compatible = "himax,hx8369",
+ .data = hx8369_lcd_init,
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, hx8357_dt_ids);
+
static int hx8357_probe(struct spi_device *spi)
{
struct lcd_device *lcdev;
struct hx8357_data *lcd;
+ const struct of_device_id *match;
int i, ret;
lcd = devm_kzalloc(&spi->dev, sizeof(*lcd), GFP_KERNEL);
@@ -411,6 +602,10 @@ static int hx8357_probe(struct spi_device *spi)
lcd->spi = spi;
+ match = of_match_device(hx8357_dt_ids, &spi->dev);
+ if (!match || !match->data)
+ return -EINVAL;
+
lcd->reset = of_get_named_gpio(spi->dev.of_node, "gpios-reset", 0);
if (!gpio_is_valid(lcd->reset)) {
dev_err(&spi->dev, "Missing dt property: gpios-reset\n");
@@ -461,7 +656,9 @@ static int hx8357_probe(struct spi_device *spi)
}
spi_set_drvdata(spi, lcdev);
- ret = hx8357_lcd_init(lcdev);
+ hx8357_lcd_reset(lcdev);
+
+ ret = ((int (*)(struct lcd_device *))match->data)(lcdev);
if (ret) {
dev_err(&spi->dev, "Couldn't initialize panel\n");
goto init_error;
@@ -484,12 +681,6 @@ static int hx8357_remove(struct spi_device *spi)
return 0;
}
-static const struct of_device_id hx8357_dt_ids[] = {
- { .compatible = "himax,hx8357" },
- {},
-};
-MODULE_DEVICE_TABLE(of, hx8357_dt_ids);
-
static struct spi_driver hx8357_driver = {
.probe = hx8357_probe,
.remove = hx8357_remove,
--
1.8.3.2
^ permalink raw reply related
* [PATCHv2 2/3] video: hx8357: Make IM pins optional
From: Maxime Ripard @ 2013-07-25 13:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374757513-2253-1-git-send-email-maxime.ripard@free-electrons.com>
The IM pins of the HX8357 controller are used to define the interface
used to feed pixel stream to the LCD panel.
Most of the time, these pins are directly routed to either the ground or
the VCC to set their values.
Remove the need to assign GPIOs to these pins when we are in such a case.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/video/backlight/hx8357.c | 53 +++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 22 deletions(-)
diff --git a/drivers/video/backlight/hx8357.c b/drivers/video/backlight/hx8357.c
index a0482b5..00614ce 100644
--- a/drivers/video/backlight/hx8357.c
+++ b/drivers/video/backlight/hx8357.c
@@ -76,6 +76,7 @@ struct hx8357_data {
unsigned reset;
struct spi_device *spi;
int state;
+ bool use_im_pins;
};
static u8 hx8357_seq_power[] = {
@@ -250,9 +251,11 @@ static int hx8357_lcd_init(struct lcd_device *lcdev)
* Set the interface selection pins to SPI mode, with three
* wires
*/
- gpio_set_value_cansleep(lcd->im_pins[0], 1);
- gpio_set_value_cansleep(lcd->im_pins[1], 0);
- gpio_set_value_cansleep(lcd->im_pins[2], 1);
+ if (lcd->use_im_pins) {
+ gpio_set_value_cansleep(lcd->im_pins[0], 1);
+ gpio_set_value_cansleep(lcd->im_pins[1], 0);
+ gpio_set_value_cansleep(lcd->im_pins[2], 1);
+ }
/* Reset the screen */
gpio_set_value(lcd->reset, 1);
@@ -424,26 +427,32 @@ static int hx8357_probe(struct spi_device *spi)
return -EINVAL;
}
- for (i = 0; i < HX8357_NUM_IM_PINS; i++) {
- lcd->im_pins[i] = of_get_named_gpio(spi->dev.of_node,
- "im-gpios", i);
- if (lcd->im_pins[i] = -EPROBE_DEFER) {
- dev_info(&spi->dev, "GPIO requested is not here yet, deferring the probe\n");
- return -EPROBE_DEFER;
- }
- if (!gpio_is_valid(lcd->im_pins[i])) {
- dev_err(&spi->dev, "Missing dt property: im-gpios\n");
- return -EINVAL;
+ if (of_find_property(spi->dev.of_node, "im-gpios", NULL)) {
+ lcd->use_im_pins = 1;
+
+ for (i = 0; i < HX8357_NUM_IM_PINS; i++) {
+ lcd->im_pins[i] = of_get_named_gpio(spi->dev.of_node,
+ "im-gpios", i);
+ if (lcd->im_pins[i] = -EPROBE_DEFER) {
+ dev_info(&spi->dev, "GPIO requested is not here yet, deferring the probe\n");
+ return -EPROBE_DEFER;
+ }
+ if (!gpio_is_valid(lcd->im_pins[i])) {
+ dev_err(&spi->dev, "Missing dt property: im-gpios\n");
+ return -EINVAL;
+ }
+
+ ret = devm_gpio_request_one(&spi->dev, lcd->im_pins[i],
+ GPIOF_OUT_INIT_LOW,
+ "im_pins");
+ if (ret) {
+ dev_err(&spi->dev, "failed to request gpio %d: %d\n",
+ lcd->im_pins[i], ret);
+ return -EINVAL;
+ }
}
-
- ret = devm_gpio_request_one(&spi->dev, lcd->im_pins[i],
- GPIOF_OUT_INIT_LOW, "im_pins");
- if (ret) {
- dev_err(&spi->dev, "failed to request gpio %d: %d\n",
- lcd->im_pins[i], ret);
- return -EINVAL;
- }
- }
+ } else
+ lcd->use_im_pins = 0;
lcdev = lcd_device_register("mxsfb", &spi->dev, lcd, &hx8357_ops);
if (IS_ERR(lcdev)) {
--
1.8.3.2
^ permalink raw reply related
* [PATCHv2 1/3] video: mxsfb: fix color settings for 18bit data bus and 32bpp
From: Maxime Ripard @ 2013-07-25 13:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1374757513-2253-1-git-send-email-maxime.ripard@free-electrons.com>
From: Hector Palacios <hector.palacios@digi.com>
For a combination of 18bit LCD data bus width and a color
mode of 32bpp, the driver was setting the color mapping to
rgb666, which is wrong, as the color in memory realy has an
rgb888 layout.
This patch also removes the setting of flag CTRL_DF24 that
makes the driver dimiss the upper 2 bits when handling 32/24bpp
colors in a diplay with 18bit data bus width. This flag made
true color images display wrong in such configurations.
Finally, the color mapping rgb666 has also been removed as nobody
is using it and high level applications like Qt5 cannot work
with it either.
Reference: https://lkml.org/lkml/2013/5/23/220
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Acked-by: Juergen Beisert <jbe@pengutronix.de>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/video/mxsfb.c | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 3ba3771..dc09ebe 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -239,24 +239,6 @@ static const struct fb_bitfield def_rgb565[] = {
}
};
-static const struct fb_bitfield def_rgb666[] = {
- [RED] = {
- .offset = 16,
- .length = 6,
- },
- [GREEN] = {
- .offset = 8,
- .length = 6,
- },
- [BLUE] = {
- .offset = 0,
- .length = 6,
- },
- [TRANSP] = { /* no support for transparency */
- .length = 0,
- }
-};
-
static const struct fb_bitfield def_rgb888[] = {
[RED] = {
.offset = 16,
@@ -309,9 +291,6 @@ static int mxsfb_check_var(struct fb_var_screeninfo *var,
break;
case STMLCDIF_16BIT:
case STMLCDIF_18BIT:
- /* 24 bit to 18 bit mapping */
- rgb = def_rgb666;
- break;
case STMLCDIF_24BIT:
/* real 24 bit */
rgb = def_rgb888;
@@ -453,11 +432,6 @@ static int mxsfb_set_par(struct fb_info *fb_info)
return -EINVAL;
case STMLCDIF_16BIT:
case STMLCDIF_18BIT:
- /* 24 bit to 18 bit mapping */
- ctrl |= CTRL_DF24; /* ignore the upper 2 bits in
- * each colour component
- */
- break;
case STMLCDIF_24BIT:
/* real 24 bit */
break;
--
1.8.3.2
^ permalink raw reply related
* [PATCHv2 0/3] Few ignored framebuffer fixes/additions
From: Maxime Ripard @ 2013-07-25 13:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This is the v2 of a set of patches that got forgotten.
These have been around for a while without any functionnal comments recently,
so I guess we should be pretty close to merge them.
It would be great if we could have comments from the maintainer on these
patches though.
Thanks,
Maxime
Changes from v1:
- Fix line wrapping in patch 2
- Added some comments on the msleep in patch 3
Alexandre Belloni (1):
fb: backlight: HX8357: Add HX8369 support
Hector Palacios (1):
video: mxsfb: fix color settings for 18bit data bus and 32bpp
Maxime Ripard (1):
video: hx8357: Make IM pins optional
drivers/video/backlight/hx8357.c | 272 +++++++++++++++++++++++++++++++++------
drivers/video/mxsfb.c | 26 ----
2 files changed, 236 insertions(+), 62 deletions(-)
--
1.8.3.2
^ permalink raw reply
* Re: kmemleak warning in efifb_probe
From: Catalin Marinas @ 2013-07-25 12:18 UTC (permalink / raw)
To: Alexandra N. Kossovsky
Cc: Peter Jones, Jean-Christophe Plagniol-Villard, Tomi Valkeinen,
linux-fbdev, Linux Kernel Mailing List
In-Reply-To: <20130721151151.GK24717@sanechka.spb.ru>
On 21 July 2013 16:11, Alexandra N. Kossovsky
<Alexandra.Kossovsky@oktetlabs.ru> wrote:
> I am running linux-3.10.0 with kmemleak and see following warnings
> in /sys/kernel/debug/kmemleak:
>
> unreferenced object 0xffff880216fcfe00 (size 512):
> comm "swapper/0", pid 1, jiffies 4294895429 (age 1415.320s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 aa aa aa aa aa aa aa aa ................
> 55 55 55 55 55 55 55 55 ff ff ff ff ff ff ff ff UUUUUUUU........
> backtrace:
> [<ffffffff813e415c>] kmemleak_alloc+0x21/0x3e
> [<ffffffff8111c17f>] kmemleak_alloc_recursive.constprop.57+0x16/0x18
> [<ffffffff8111e63b>] __kmalloc+0xf9/0x144
> [<ffffffff8123d9cf>] fb_alloc_cmap_gfp+0x47/0xe1
> [<ffffffff8123da77>] fb_alloc_cmap+0xe/0x10
> [<ffffffff81aff40a>] efifb_probe+0x3e9/0x48f
> [<ffffffff812c566f>] platform_drv_probe+0x34/0x5e
> [<ffffffff812c3e6d>] driver_probe_device+0x98/0x1b4
> [<ffffffff812c3fd7>] __driver_attach+0x4e/0x6f
> [<ffffffff812c25bf>] bus_for_each_dev+0x57/0x8a
> [<ffffffff812c3984>] driver_attach+0x19/0x1b
> [<ffffffff812c362b>] bus_add_driver+0xde/0x201
> [<ffffffff812c453f>] driver_register+0x8c/0x110
> [<ffffffff812c510d>] platform_driver_register+0x41/0x43
> [<ffffffff812c5127>] platform_driver_probe+0x18/0x8a
> [<ffffffff81aff002>] efifb_init+0x276/0x295
Does the efifb driver has any way to deallocate the cmap? I don't see
any explicit call to fb_dealloc_cmap() apart from the error handling.
My theory is that the efifb driver gets deregistered via
do_remove_conflicting_framebuffers(). I'm not familiar with this code,
just commenting from a kmemleak perspective.
--
Catalin
^ permalink raw reply
* Re: [PATCH 01/15] drivers: phy: add generic PHY framework
From: Mark Brown @ 2013-07-25 12:09 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201307251300.49282.arnd@arndb.de>
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
On Thu, Jul 25, 2013 at 01:00:49PM +0200, Arnd Bergmann wrote:
> I'm not saying that we can't support legacy board files with the common
> PHY framework, but I'd expect things to be much easier if we focus on those
> platforms that are actively being worked on for now, to bring an end to the
> pointless API discussion.
Well, it seemed like Greg's concerns had already been addressed anyway.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH v2] video: xilinxfb: Fix compilation warning
From: Michal Simek @ 2013-07-25 11:21 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Jingoo Han, Geert Uytterhoeven
Cc: Michal Simek, Tomi Valkeinen, linux-fbdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]
regs_phys is phys_addr_t (u32 or u64).
Lets retype it to u64.
Fixes compilation warning introduced by:
video: xilinxfb: Use drvdata->regs_phys instead of physaddr
(sha1: c88fafef0135e1e1c3e23c3e32ccbeeabc587f81)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Use %pa instead of casting
ppc44x_defconfig
Fixes regressions in v3.11-rc2
---
drivers/video/xilinxfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index f3d4a69..6629b29 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -341,8 +341,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
if (drvdata->flags & BUS_ACCESS_FLAG) {
/* Put a banner in the log (for DEBUG) */
- dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
- drvdata->regs);
+ dev_dbg(dev, "regs: phys=%pa, virt=%p\n",
+ &drvdata->regs_phys, drvdata->regs);
}
/* Put a banner in the log (for DEBUG) */
dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related
* Re: [PATCH 01/15] drivers: phy: add generic PHY framework
From: Laurent Pinchart @ 2013-07-25 11:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201307251300.49282.arnd@arndb.de>
Hi Arnd,
On Thursday 25 July 2013 13:00:49 Arnd Bergmann wrote:
> On Thursday 25 July 2013, Laurent Pinchart wrote:
> > On Wednesday 24 July 2013 20:32:03 Arnd Bergmann wrote:
> > > On Tuesday 23 July 2013, Tomasz Figa wrote:
> > > > On Tuesday 23 of July 2013 17:14:20 Alan Stern wrote:
> > > > > On Tue, 23 Jul 2013, Tomasz Figa wrote:
> > > > > > Where would you want to have those phy_address arrays stored?
> > > > > > There are no board files when booting with DT. Not even saying
> > > > > > that you don't need to use any hacky schemes like this when you
> > > > > > have DT that nicely specifies relations between devices.
> > > > >
> > > > > If everybody agrees DT has a nice scheme for specifying relations
> > > > > between devices, why not use that same scheme in the PHY core?
> > > >
> > > > It is already used, for cases when consumer device has a DT node
> > > > attached. In non-DT case this kind lookup translates loosely to
> > > > something that is being done in regulator framework - you can't bind
> > > > devices by pointers, because you don't have those pointers, so you
> > > > need to use device names.
> > >
> > > Sorry for jumping in to the middle of the discussion, but why does a new
> > > framework even bother defining an interface for board files?
> > >
> > > Can't we just drop any interfaces for platform data passing in the phy
> > > framework and put the burden of adding those to anyone who actually
> > > needs them? All the platforms we are concerned with here (exynos and
> > > omap, plus new platforms) can be booted using DT anyway.
> >
> > What about non-DT architectures such as MIPS (still widely used in
> > consumer networking equipments from what I've heard) ?
>
> * Vendors of such equipment have started moving on to ARM (e.g. Broadcom
> bcm47xx)
> * Some of the modern MIPS platforms are now using DT
> * Legacy platforms probably won't migrate to either DT or the generic PHY
> framework
>
> I'm not saying that we can't support legacy board files with the common PHY
> framework, but I'd expect things to be much easier if we focus on those
> platforms that are actively being worked on for now, to bring an end to the
> pointless API discussion.
Fair enough :-)
--
Regards,
Laurent Pinchart
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox