2019-05-27 08:55:06 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2016-08-18 20:23:01 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
|
|
|
|
|
*
|
|
|
|
|
* This code is based on drivers/video/fbdev/mxsfb.c :
|
|
|
|
|
* Copyright (C) 2010 Juergen Beisert, Pengutronix
|
|
|
|
|
* Copyright (C) 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
|
|
|
* Copyright (C) 2008 Embedded Alley Solutions, Inc All Rights Reserved.
|
|
|
|
|
*/
|
|
|
|
|
|
2019-06-30 08:18:54 +02:00
|
|
|
#include <linux/clk.h>
|
2020-07-27 05:06:43 +03:00
|
|
|
#include <linux/io.h>
|
2019-06-30 08:18:54 +02:00
|
|
|
#include <linux/iopoll.h>
|
2022-06-30 22:51:13 +03:00
|
|
|
#include <linux/media-bus-format.h>
|
2020-07-27 05:06:43 +03:00
|
|
|
#include <linux/pm_runtime.h>
|
2020-07-27 05:06:41 +03:00
|
|
|
#include <linux/spinlock.h>
|
2019-06-30 08:18:54 +02:00
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
#include <drm/drm_atomic.h>
|
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
2020-07-27 05:06:41 +03:00
|
|
|
#include <drm/drm_bridge.h>
|
2016-08-18 20:23:01 +02:00
|
|
|
#include <drm/drm_crtc.h>
|
2020-07-27 05:06:43 +03:00
|
|
|
#include <drm/drm_encoder.h>
|
2022-08-02 02:04:02 +02:00
|
|
|
#include <drm/drm_fb_dma_helper.h>
|
2020-07-27 05:06:41 +03:00
|
|
|
#include <drm/drm_fourcc.h>
|
2022-06-14 12:54:49 +03:00
|
|
|
#include <drm/drm_framebuffer.h>
|
2021-02-22 15:17:56 +01:00
|
|
|
#include <drm/drm_gem_atomic_helper.h>
|
2022-08-02 02:04:03 +02:00
|
|
|
#include <drm/drm_gem_dma_helper.h>
|
2020-07-27 05:06:43 +03:00
|
|
|
#include <drm/drm_plane.h>
|
2019-06-30 08:18:54 +02:00
|
|
|
#include <drm/drm_vblank.h>
|
2016-08-18 20:23:01 +02:00
|
|
|
|
|
|
|
|
#include "mxsfb_drv.h"
|
|
|
|
|
#include "mxsfb_regs.h"
|
|
|
|
|
|
2017-05-05 15:01:41 -03:00
|
|
|
/* 1 second delay should be plenty of time for block reset */
|
|
|
|
|
#define RESET_TIMEOUT 1000000
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
|
* CRTC
|
|
|
|
|
*/
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
static u32 set_hsync_pulse_width(struct mxsfb_drm_private *mxsfb, u32 val)
|
|
|
|
|
{
|
|
|
|
|
return (val & mxsfb->devdata->hs_wdth_mask) <<
|
|
|
|
|
mxsfb->devdata->hs_wdth_shift;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:52 +03:00
|
|
|
/*
|
|
|
|
|
* Setup the MXSFB registers for decoding the pixels out of the framebuffer and
|
|
|
|
|
* outputting them on the bus.
|
|
|
|
|
*/
|
2021-07-26 21:44:57 +02:00
|
|
|
static void mxsfb_set_formats(struct mxsfb_drm_private *mxsfb,
|
|
|
|
|
const u32 bus_format)
|
2016-08-18 20:23:01 +02:00
|
|
|
{
|
2020-07-27 05:06:43 +03:00
|
|
|
struct drm_device *drm = mxsfb->drm;
|
|
|
|
|
const u32 format = mxsfb->crtc.primary->state->fb->format->format;
|
2016-08-18 20:23:01 +02:00
|
|
|
u32 ctrl, ctrl1;
|
|
|
|
|
|
2020-07-27 05:06:52 +03:00
|
|
|
DRM_DEV_DEBUG_DRIVER(drm->dev, "Using bus_format: 0x%08X\n",
|
|
|
|
|
bus_format);
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER;
|
|
|
|
|
|
|
|
|
|
/* CTRL1 contains IRQ config and status bits, preserve those. */
|
|
|
|
|
ctrl1 = readl(mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
ctrl1 &= CTRL1_CUR_FRAME_DONE_IRQ_EN | CTRL1_CUR_FRAME_DONE_IRQ;
|
|
|
|
|
|
|
|
|
|
switch (format) {
|
|
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
|
dev_dbg(drm->dev, "Setting up RGB565 mode\n");
|
2020-07-27 05:06:37 +03:00
|
|
|
ctrl |= CTRL_WORD_LENGTH_16;
|
2016-08-18 20:23:01 +02:00
|
|
|
ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0xf);
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
|
dev_dbg(drm->dev, "Setting up XRGB8888 mode\n");
|
2020-07-27 05:06:37 +03:00
|
|
|
ctrl |= CTRL_WORD_LENGTH_24;
|
2016-08-18 20:23:01 +02:00
|
|
|
/* Do not use packed pixels = one pixel per word instead. */
|
|
|
|
|
ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0x7);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-14 17:28:41 -08:00
|
|
|
switch (bus_format) {
|
|
|
|
|
case MEDIA_BUS_FMT_RGB565_1X16:
|
2020-07-27 05:06:52 +03:00
|
|
|
ctrl |= CTRL_BUS_WIDTH_16;
|
2016-12-14 17:28:41 -08:00
|
|
|
break;
|
|
|
|
|
case MEDIA_BUS_FMT_RGB666_1X18:
|
2020-07-27 05:06:52 +03:00
|
|
|
ctrl |= CTRL_BUS_WIDTH_18;
|
2016-12-14 17:28:41 -08:00
|
|
|
break;
|
|
|
|
|
case MEDIA_BUS_FMT_RGB888_1X24:
|
2020-07-27 05:06:52 +03:00
|
|
|
ctrl |= CTRL_BUS_WIDTH_24;
|
2016-12-14 17:28:41 -08:00
|
|
|
break;
|
|
|
|
|
default:
|
2021-10-11 15:41:26 +02:00
|
|
|
dev_err(drm->dev, "Unknown media bus format 0x%x\n", bus_format);
|
2016-12-14 17:28:41 -08:00
|
|
|
break;
|
|
|
|
|
}
|
2020-07-27 05:06:52 +03:00
|
|
|
|
|
|
|
|
writel(ctrl1, mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
writel(ctrl, mxsfb->base + LCDC_CTRL);
|
2016-12-14 17:28:41 -08:00
|
|
|
}
|
|
|
|
|
|
2022-04-17 04:07:59 +02:00
|
|
|
static void mxsfb_set_mode(struct mxsfb_drm_private *mxsfb, u32 bus_flags)
|
|
|
|
|
{
|
|
|
|
|
struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode;
|
|
|
|
|
u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;
|
|
|
|
|
|
|
|
|
|
writel(TRANSFER_COUNT_SET_VCOUNT(m->crtc_vdisplay) |
|
|
|
|
|
TRANSFER_COUNT_SET_HCOUNT(m->crtc_hdisplay),
|
|
|
|
|
mxsfb->base + mxsfb->devdata->transfer_count);
|
|
|
|
|
|
|
|
|
|
vsync_pulse_len = m->crtc_vsync_end - m->crtc_vsync_start;
|
|
|
|
|
|
|
|
|
|
vdctrl0 = VDCTRL0_ENABLE_PRESENT | /* Always in DOTCLOCK mode */
|
|
|
|
|
VDCTRL0_VSYNC_PERIOD_UNIT |
|
|
|
|
|
VDCTRL0_VSYNC_PULSE_WIDTH_UNIT |
|
|
|
|
|
VDCTRL0_SET_VSYNC_PULSE_WIDTH(vsync_pulse_len);
|
|
|
|
|
if (m->flags & DRM_MODE_FLAG_PHSYNC)
|
|
|
|
|
vdctrl0 |= VDCTRL0_HSYNC_ACT_HIGH;
|
|
|
|
|
if (m->flags & DRM_MODE_FLAG_PVSYNC)
|
|
|
|
|
vdctrl0 |= VDCTRL0_VSYNC_ACT_HIGH;
|
|
|
|
|
/* Make sure Data Enable is high active by default */
|
|
|
|
|
if (!(bus_flags & DRM_BUS_FLAG_DE_LOW))
|
|
|
|
|
vdctrl0 |= VDCTRL0_ENABLE_ACT_HIGH;
|
|
|
|
|
/*
|
|
|
|
|
* DRM_BUS_FLAG_PIXDATA_DRIVE_ defines are controller centric,
|
|
|
|
|
* controllers VDCTRL0_DOTCLK is display centric.
|
|
|
|
|
* Drive on positive edge -> display samples on falling edge
|
|
|
|
|
* DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE -> VDCTRL0_DOTCLK_ACT_FALLING
|
|
|
|
|
*/
|
|
|
|
|
if (bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
|
|
|
|
|
vdctrl0 |= VDCTRL0_DOTCLK_ACT_FALLING;
|
|
|
|
|
|
|
|
|
|
writel(vdctrl0, mxsfb->base + LCDC_VDCTRL0);
|
|
|
|
|
|
|
|
|
|
/* Frame length in lines. */
|
|
|
|
|
writel(m->crtc_vtotal, mxsfb->base + LCDC_VDCTRL1);
|
|
|
|
|
|
|
|
|
|
/* Line length in units of clocks or pixels. */
|
|
|
|
|
hsync_pulse_len = m->crtc_hsync_end - m->crtc_hsync_start;
|
|
|
|
|
writel(set_hsync_pulse_width(mxsfb, hsync_pulse_len) |
|
|
|
|
|
VDCTRL2_SET_HSYNC_PERIOD(m->crtc_htotal),
|
|
|
|
|
mxsfb->base + LCDC_VDCTRL2);
|
|
|
|
|
|
|
|
|
|
writel(SET_HOR_WAIT_CNT(m->crtc_htotal - m->crtc_hsync_start) |
|
|
|
|
|
SET_VERT_WAIT_CNT(m->crtc_vtotal - m->crtc_vsync_start),
|
|
|
|
|
mxsfb->base + LCDC_VDCTRL3);
|
|
|
|
|
|
|
|
|
|
writel(SET_DOTCLK_H_VALID_DATA_CNT(m->hdisplay),
|
|
|
|
|
mxsfb->base + LCDC_VDCTRL4);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb)
|
|
|
|
|
{
|
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
|
|
if (mxsfb->clk_disp_axi)
|
|
|
|
|
clk_prepare_enable(mxsfb->clk_disp_axi);
|
|
|
|
|
clk_prepare_enable(mxsfb->clk);
|
|
|
|
|
|
2021-06-21 00:47:59 +02:00
|
|
|
/* Increase number of outstanding requests on all supported IPs */
|
|
|
|
|
if (mxsfb->devdata->has_ctrl2) {
|
|
|
|
|
reg = readl(mxsfb->base + LCDC_V4_CTRL2);
|
|
|
|
|
reg &= ~CTRL2_SET_OUTSTANDING_REQS_MASK;
|
|
|
|
|
reg |= CTRL2_SET_OUTSTANDING_REQS_16;
|
|
|
|
|
writel(reg, mxsfb->base + LCDC_V4_CTRL2);
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
/* If it was disabled, re-enable the mode again */
|
|
|
|
|
writel(CTRL_DOTCLK_MODE, mxsfb->base + LCDC_CTRL + REG_SET);
|
|
|
|
|
|
|
|
|
|
/* Enable the SYNC signals first, then the DMA engine */
|
|
|
|
|
reg = readl(mxsfb->base + LCDC_VDCTRL4);
|
|
|
|
|
reg |= VDCTRL4_SYNC_SIGNALS_ON;
|
|
|
|
|
writel(reg, mxsfb->base + LCDC_VDCTRL4);
|
|
|
|
|
|
2021-06-21 00:47:01 +02:00
|
|
|
/*
|
|
|
|
|
* Enable recovery on underflow.
|
|
|
|
|
*
|
|
|
|
|
* There is some sort of corner case behavior of the controller,
|
|
|
|
|
* which could rarely be triggered at least on i.MX6SX connected
|
|
|
|
|
* to 800x480 DPI panel and i.MX8MM connected to DPI->DSI->LVDS
|
|
|
|
|
* bridged 1920x1080 panel (and likely on other setups too), where
|
|
|
|
|
* the image on the panel shifts to the right and wraps around.
|
|
|
|
|
* This happens either when the controller is enabled on boot or
|
|
|
|
|
* even later during run time. The condition does not correct
|
|
|
|
|
* itself automatically, i.e. the display image remains shifted.
|
|
|
|
|
*
|
|
|
|
|
* It seems this problem is known and is due to sporadic underflows
|
|
|
|
|
* of the LCDIF FIFO. While the LCDIF IP does have underflow/overflow
|
|
|
|
|
* IRQs, neither of the IRQs trigger and neither IRQ status bit is
|
|
|
|
|
* asserted when this condition occurs.
|
|
|
|
|
*
|
|
|
|
|
* All known revisions of the LCDIF IP have CTRL1 RECOVER_ON_UNDERFLOW
|
|
|
|
|
* bit, which is described in the reference manual since i.MX23 as
|
|
|
|
|
* "
|
|
|
|
|
* Set this bit to enable the LCDIF block to recover in the next
|
|
|
|
|
* field/frame if there was an underflow in the current field/frame.
|
|
|
|
|
* "
|
|
|
|
|
* Enable this bit to mitigate the sporadic underflows.
|
|
|
|
|
*/
|
|
|
|
|
reg = readl(mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
reg |= CTRL1_RECOVER_ON_UNDERFLOW;
|
|
|
|
|
writel(reg, mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_SET);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb)
|
|
|
|
|
{
|
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Even if we disable the controller here, it will still continue
|
|
|
|
|
* until its FIFOs are running out of data
|
|
|
|
|
*/
|
|
|
|
|
writel(CTRL_DOTCLK_MODE, mxsfb->base + LCDC_CTRL + REG_CLR);
|
|
|
|
|
|
|
|
|
|
readl_poll_timeout(mxsfb->base + LCDC_CTRL, reg, !(reg & CTRL_RUN),
|
|
|
|
|
0, 1000);
|
|
|
|
|
|
|
|
|
|
reg = readl(mxsfb->base + LCDC_VDCTRL4);
|
|
|
|
|
reg &= ~VDCTRL4_SYNC_SIGNALS_ON;
|
|
|
|
|
writel(reg, mxsfb->base + LCDC_VDCTRL4);
|
|
|
|
|
|
|
|
|
|
clk_disable_unprepare(mxsfb->clk);
|
|
|
|
|
if (mxsfb->clk_disp_axi)
|
|
|
|
|
clk_disable_unprepare(mxsfb->clk_disp_axi);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-05 15:01:41 -03:00
|
|
|
/*
|
|
|
|
|
* Clear the bit and poll it cleared. This is usually called with
|
|
|
|
|
* a reset address and mask being either SFTRST(bit 31) or CLKGATE
|
|
|
|
|
* (bit 30).
|
|
|
|
|
*/
|
|
|
|
|
static int clear_poll_bit(void __iomem *addr, u32 mask)
|
|
|
|
|
{
|
|
|
|
|
u32 reg;
|
|
|
|
|
|
2020-07-27 05:06:40 +03:00
|
|
|
writel(mask, addr + REG_CLR);
|
2017-05-05 15:01:41 -03:00
|
|
|
return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:38 +03:00
|
|
|
static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
|
2017-05-05 15:01:41 -03:00
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-04-17 04:07:57 +02:00
|
|
|
/*
|
|
|
|
|
* It seems, you can't re-program the controller if it is still
|
|
|
|
|
* running. This may lead to shifted pictures (FIFO issue?), so
|
|
|
|
|
* first stop the controller and drain its FIFOs.
|
|
|
|
|
*/
|
|
|
|
|
|
2020-07-27 05:06:40 +03:00
|
|
|
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
|
2017-05-05 15:01:41 -03:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-07-27 05:06:40 +03:00
|
|
|
writel(CTRL_CLKGATE, mxsfb->base + LCDC_CTRL + REG_CLR);
|
2017-05-05 15:01:41 -03:00
|
|
|
|
2020-07-27 05:06:40 +03:00
|
|
|
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
|
2017-05-05 15:01:41 -03:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2022-04-17 04:07:57 +02:00
|
|
|
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* Clear the FIFOs */
|
|
|
|
|
writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET);
|
|
|
|
|
readl(mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_CLR);
|
|
|
|
|
readl(mxsfb->base + LCDC_CTRL1);
|
|
|
|
|
|
|
|
|
|
if (mxsfb->devdata->has_overlay)
|
|
|
|
|
writel(0, mxsfb->base + LCDC_AS_CTRL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
2017-05-05 15:01:41 -03:00
|
|
|
}
|
|
|
|
|
|
2021-07-26 21:44:57 +02:00
|
|
|
static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,
|
2022-04-17 04:10:11 +02:00
|
|
|
struct drm_bridge_state *bridge_state,
|
2021-07-26 21:44:57 +02:00
|
|
|
const u32 bus_format)
|
2016-08-18 20:23:01 +02:00
|
|
|
{
|
2020-07-27 05:06:43 +03:00
|
|
|
struct drm_device *drm = mxsfb->crtc.dev;
|
|
|
|
|
struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode;
|
2019-08-29 14:30:03 +03:00
|
|
|
u32 bus_flags = mxsfb->connector->display_info.bus_flags;
|
2016-08-18 20:23:01 +02:00
|
|
|
int err;
|
|
|
|
|
|
2019-08-29 14:30:03 +03:00
|
|
|
if (mxsfb->bridge && mxsfb->bridge->timings)
|
|
|
|
|
bus_flags = mxsfb->bridge->timings->input_bus_flags;
|
2022-04-17 04:10:11 +02:00
|
|
|
else if (bridge_state)
|
|
|
|
|
bus_flags = bridge_state->input_bus_cfg.flags;
|
2019-08-29 14:30:03 +03:00
|
|
|
|
2019-08-29 14:30:02 +03:00
|
|
|
DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n",
|
|
|
|
|
m->crtc_clock,
|
|
|
|
|
(int)(clk_get_rate(mxsfb->clk) / 1000));
|
|
|
|
|
DRM_DEV_DEBUG_DRIVER(drm->dev, "Connector bus_flags: 0x%08X\n",
|
|
|
|
|
bus_flags);
|
|
|
|
|
DRM_DEV_DEBUG_DRIVER(drm->dev, "Mode flags: 0x%08X\n", m->flags);
|
|
|
|
|
|
2022-04-17 04:08:00 +02:00
|
|
|
/* Mandatory eLCDIF reset as per the Reference Manual */
|
|
|
|
|
err = mxsfb_reset_block(mxsfb);
|
|
|
|
|
if (err)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
mxsfb_set_formats(mxsfb, bus_format);
|
|
|
|
|
|
|
|
|
|
clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
|
|
|
|
|
|
2022-04-17 04:07:59 +02:00
|
|
|
mxsfb_set_mode(mxsfb, bus_flags);
|
2016-08-18 20:23:01 +02:00
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
static int mxsfb_crtc_atomic_check(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic_check
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_check.
The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier ret, f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- ret = FUNCS->atomic_check(crtc, crtc_state);
+ ret = FUNCS->atomic_check(crtc, state);
...>
}
@@
identifier crtc, new_state;
@@
struct drm_crtc_helper_funcs {
...
- int (*atomic_check)(struct drm_crtc *crtc, struct drm_crtc_state *new_state);
+ int (*atomic_check)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@ ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc,
struct drm_crtc_state *new_state)
{
... when != new_state
}
@ adds_new_state depends on crtc_atomic_func && !ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc, struct drm_crtc_state *new_state)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
int func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
int func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier new_state;
identifier crtc;
@@
int func(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{ ... }
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
);
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-maxime@cerno.tech
2020-10-28 13:32:21 +01:00
|
|
|
struct drm_atomic_state *state)
|
2016-08-18 20:23:01 +02:00
|
|
|
{
|
drm/atomic: Pass the full state to CRTC atomic_check
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_check.
The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier ret, f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- ret = FUNCS->atomic_check(crtc, crtc_state);
+ ret = FUNCS->atomic_check(crtc, state);
...>
}
@@
identifier crtc, new_state;
@@
struct drm_crtc_helper_funcs {
...
- int (*atomic_check)(struct drm_crtc *crtc, struct drm_crtc_state *new_state);
+ int (*atomic_check)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@ ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc,
struct drm_crtc_state *new_state)
{
... when != new_state
}
@ adds_new_state depends on crtc_atomic_func && !ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc, struct drm_crtc_state *new_state)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
int func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
int func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier new_state;
identifier crtc;
@@
int func(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{ ... }
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
);
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-maxime@cerno.tech
2020-10-28 13:32:21 +01:00
|
|
|
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
|
|
|
|
|
crtc);
|
|
|
|
|
bool has_primary = crtc_state->plane_mask &
|
2020-07-27 05:06:43 +03:00
|
|
|
drm_plane_mask(crtc->primary);
|
|
|
|
|
|
|
|
|
|
/* The primary plane has to be enabled when the CRTC is active. */
|
drm/atomic: Pass the full state to CRTC atomic_check
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_check.
The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier ret, f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- ret = FUNCS->atomic_check(crtc, crtc_state);
+ ret = FUNCS->atomic_check(crtc, state);
...>
}
@@
identifier crtc, new_state;
@@
struct drm_crtc_helper_funcs {
...
- int (*atomic_check)(struct drm_crtc *crtc, struct drm_crtc_state *new_state);
+ int (*atomic_check)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@ ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc,
struct drm_crtc_state *new_state)
{
... when != new_state
}
@ adds_new_state depends on crtc_atomic_func && !ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc, struct drm_crtc_state *new_state)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
int func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
int func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier new_state;
identifier crtc;
@@
int func(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{ ... }
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
);
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-maxime@cerno.tech
2020-10-28 13:32:21 +01:00
|
|
|
if (crtc_state->active && !has_primary)
|
2020-07-27 05:06:43 +03:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
/* TODO: Is this needed ? */
|
2020-11-02 14:38:34 +01:00
|
|
|
return drm_atomic_add_affected_planes(state, crtc);
|
2020-07-27 05:06:43 +03:00
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:44 +03:00
|
|
|
static void mxsfb_crtc_atomic_flush(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic begin and flush
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_begin and atomic_flush.
The conversion was done using the coccinelle script below, built tested on
all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_begin(crtc, old_crtc_state);
+ FUNCS->atomic_begin(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_flush(crtc, old_crtc_state);
+ FUNCS->atomic_flush(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_begin(crtc, crtc_state);
+ FUNCS->atomic_begin(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_flush(crtc, crtc_state);
+ FUNCS->atomic_flush(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_begin)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_begin)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_flush)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_flush)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = func,
...,
};
)
@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc,
struct drm_crtc_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
void func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
void func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier old_state;
identifier crtc;
@@
void func(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-maxime@cerno.tech
2020-10-28 13:32:22 +01:00
|
|
|
struct drm_atomic_state *state)
|
2020-07-27 05:06:44 +03:00
|
|
|
{
|
|
|
|
|
struct drm_pending_vblank_event *event;
|
|
|
|
|
|
|
|
|
|
event = crtc->state->event;
|
|
|
|
|
crtc->state->event = NULL;
|
|
|
|
|
|
|
|
|
|
if (!event)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
spin_lock_irq(&crtc->dev->event_lock);
|
|
|
|
|
if (drm_crtc_vblank_get(crtc) == 0)
|
|
|
|
|
drm_crtc_arm_vblank_event(crtc, event);
|
|
|
|
|
else
|
|
|
|
|
drm_crtc_send_vblank_event(crtc, event);
|
|
|
|
|
spin_unlock_irq(&crtc->dev->event_lock);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic enable/disable
If the CRTC driver ever needs to access the full DRM state, it can't do so
at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
will have cleared the pointer from the struct drm_crtc_state to the struct
drm_atomic_state before calling those hooks.
In order to allow that, let's pass the full DRM state to atomic_enable and
atomic_disable. The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_disable(crtc, crtc_state);
+ FUNCS->atomic_disable(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_enable(crtc, crtc_state);
+ FUNCS->atomic_enable(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_enable = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc,
struct drm_crtc_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
void func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
void func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier old_state;
identifier crtc;
@@
void func(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
2020-10-08 14:44:08 +02:00
|
|
|
struct drm_atomic_state *state)
|
2020-07-27 05:06:43 +03:00
|
|
|
{
|
|
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
2022-04-17 04:07:58 +02:00
|
|
|
struct drm_plane_state *new_pstate = drm_atomic_get_new_plane_state(state,
|
|
|
|
|
crtc->primary);
|
2022-04-17 04:10:11 +02:00
|
|
|
struct drm_bridge_state *bridge_state = NULL;
|
2020-07-27 05:06:43 +03:00
|
|
|
struct drm_device *drm = mxsfb->drm;
|
2021-07-26 21:44:57 +02:00
|
|
|
u32 bus_format = 0;
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr_t dma_addr;
|
2018-09-17 16:42:12 +03:00
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
pm_runtime_get_sync(drm->dev);
|
2018-09-17 16:42:11 +03:00
|
|
|
mxsfb_enable_axi_clk(mxsfb);
|
2020-07-27 05:06:46 +03:00
|
|
|
|
|
|
|
|
drm_crtc_vblank_on(crtc);
|
|
|
|
|
|
2021-07-26 21:44:57 +02:00
|
|
|
/* If there is a bridge attached to the LCDIF, use its bus format */
|
|
|
|
|
if (mxsfb->bridge) {
|
|
|
|
|
bridge_state =
|
|
|
|
|
drm_atomic_get_new_bridge_state(state,
|
|
|
|
|
mxsfb->bridge);
|
2022-02-02 09:17:55 +01:00
|
|
|
if (!bridge_state)
|
|
|
|
|
bus_format = MEDIA_BUS_FMT_FIXED;
|
|
|
|
|
else
|
|
|
|
|
bus_format = bridge_state->input_bus_cfg.format;
|
|
|
|
|
|
2021-10-11 15:41:27 +02:00
|
|
|
if (bus_format == MEDIA_BUS_FMT_FIXED) {
|
|
|
|
|
dev_warn_once(drm->dev,
|
|
|
|
|
"Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
|
|
|
|
|
"Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
|
|
|
|
|
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
|
|
|
|
|
}
|
2021-07-26 21:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there is no bridge, use bus format from connector */
|
|
|
|
|
if (!bus_format && mxsfb->connector->display_info.num_bus_formats)
|
|
|
|
|
bus_format = mxsfb->connector->display_info.bus_formats[0];
|
|
|
|
|
|
|
|
|
|
/* If all else fails, default to RGB888_1X24 */
|
|
|
|
|
if (!bus_format)
|
|
|
|
|
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
|
|
|
|
|
|
2022-04-17 04:10:11 +02:00
|
|
|
mxsfb_crtc_mode_set_nofb(mxsfb, bridge_state, bus_format);
|
2018-09-17 16:42:12 +03:00
|
|
|
|
|
|
|
|
/* Write cur_buf as well to avoid an initial corrupt frame */
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
|
|
|
|
|
if (dma_addr) {
|
|
|
|
|
writel(dma_addr, mxsfb->base + mxsfb->devdata->cur_buf);
|
|
|
|
|
writel(dma_addr, mxsfb->base + mxsfb->devdata->next_buf);
|
2018-09-17 16:42:12 +03:00
|
|
|
}
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
mxsfb_enable_controller(mxsfb);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic enable/disable
If the CRTC driver ever needs to access the full DRM state, it can't do so
at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
will have cleared the pointer from the struct drm_crtc_state to the struct
drm_atomic_state before calling those hooks.
In order to allow that, let's pass the full DRM state to atomic_enable and
atomic_disable. The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_disable(crtc, crtc_state);
+ FUNCS->atomic_disable(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_enable(crtc, crtc_state);
+ FUNCS->atomic_enable(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_enable = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc,
struct drm_crtc_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
void func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
void func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier old_state;
identifier crtc;
@@
void func(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
2020-10-08 14:44:08 +02:00
|
|
|
struct drm_atomic_state *state)
|
2016-08-18 20:23:01 +02:00
|
|
|
{
|
2020-07-27 05:06:43 +03:00
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
|
|
|
|
struct drm_device *drm = mxsfb->drm;
|
|
|
|
|
struct drm_pending_vblank_event *event;
|
|
|
|
|
|
2016-08-18 20:23:01 +02:00
|
|
|
mxsfb_disable_controller(mxsfb);
|
2020-07-27 05:06:43 +03:00
|
|
|
|
|
|
|
|
spin_lock_irq(&drm->event_lock);
|
|
|
|
|
event = crtc->state->event;
|
|
|
|
|
if (event) {
|
|
|
|
|
crtc->state->event = NULL;
|
|
|
|
|
drm_crtc_send_vblank_event(crtc, event);
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irq(&drm->event_lock);
|
2020-07-27 05:06:45 +03:00
|
|
|
|
2020-07-27 05:06:46 +03:00
|
|
|
drm_crtc_vblank_off(crtc);
|
|
|
|
|
|
2020-07-27 05:06:45 +03:00
|
|
|
mxsfb_disable_axi_clk(mxsfb);
|
|
|
|
|
pm_runtime_put_sync(drm->dev);
|
2020-07-27 05:06:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
|
|
|
|
|
{
|
|
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
|
|
|
|
|
|
|
|
|
/* Clear and enable VBLANK IRQ */
|
|
|
|
|
writel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 + REG_CLR);
|
|
|
|
|
writel(CTRL1_CUR_FRAME_DONE_IRQ_EN, mxsfb->base + LCDC_CTRL1 + REG_SET);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mxsfb_crtc_disable_vblank(struct drm_crtc *crtc)
|
|
|
|
|
{
|
|
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
|
|
|
|
|
|
|
|
|
/* Disable and clear VBLANK IRQ */
|
|
|
|
|
writel(CTRL1_CUR_FRAME_DONE_IRQ_EN, mxsfb->base + LCDC_CTRL1 + REG_CLR);
|
|
|
|
|
writel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 + REG_CLR);
|
|
|
|
|
}
|
|
|
|
|
|
drm: mxsfb: Implement LCDIF scanout CRC32 support
The LCDIF controller as present in i.MX28/i.MX6SX/i.MX8M Mini/Nano has
CRC_STAT register, which contains CRC32 of the frame as it was clocked
out of the DPI interface of the LCDIF. This is most likely meant as a
functional safety feature.
Unfortunately, there is zero documentation on how the CRC32 is calculated,
there is no documentation of the polynomial, the init value, nor on which
data is the checksum applied.
By applying brute-force on 8 pixel / 2 line frame, which is the minimum
size LCDIF would work with, it turns out the polynomial is CRC32_POLY_LE
0xedb88320 , init value is 0xffffffff , the input data are bitrev32()
of the entire frame and the resulting CRC has to be also bitrev32()ed.
Doing this calculation in kernel for each frame is unrealistic due to the
CPU demand, so attach the CRC collected from hardware to a frame instead.
The DRM subsystem already has an interface for this purpose and the CRC
can be accessed e.g. via debugfs:
"
$ echo auto > /sys/kernel/debug/dri/1/crtc-0/crc/control
$ cat /sys/kernel/debug/dri/1/crtc-0/crc/data
0x0000408c 0xa4e5cdd8
0x0000408d 0x72f537b4
"
The per-frame CRC can be used by userspace e.g. during automated testing,
to verify that whatever buffer was sent to be scanned out was actually
scanned out of the LCDIF correctly.
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Stein <alexander.stein@ew.tq-group.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Robby Cai <robby.cai@nxp.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429212313.305556-1-marex@denx.de
2022-04-29 23:23:13 +02:00
|
|
|
static int mxsfb_crtc_set_crc_source(struct drm_crtc *crtc, const char *source)
|
|
|
|
|
{
|
|
|
|
|
struct mxsfb_drm_private *mxsfb;
|
|
|
|
|
|
|
|
|
|
if (!crtc)
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
|
|
mxsfb = to_mxsfb_drm_private(crtc->dev);
|
|
|
|
|
|
|
|
|
|
if (source && strcmp(source, "auto") == 0)
|
|
|
|
|
mxsfb->crc_active = true;
|
|
|
|
|
else if (!source)
|
|
|
|
|
mxsfb->crc_active = false;
|
|
|
|
|
else
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int mxsfb_crtc_verify_crc_source(struct drm_crtc *crtc,
|
|
|
|
|
const char *source, size_t *values_cnt)
|
|
|
|
|
{
|
|
|
|
|
if (!crtc)
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
|
|
if (source && strcmp(source, "auto") != 0) {
|
|
|
|
|
DRM_DEBUG_DRIVER("Unknown CRC source %s for %s\n",
|
|
|
|
|
source, crtc->name);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*values_cnt = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
static const struct drm_crtc_helper_funcs mxsfb_crtc_helper_funcs = {
|
|
|
|
|
.atomic_check = mxsfb_crtc_atomic_check,
|
2020-07-27 05:06:44 +03:00
|
|
|
.atomic_flush = mxsfb_crtc_atomic_flush,
|
2020-07-27 05:06:43 +03:00
|
|
|
.atomic_enable = mxsfb_crtc_atomic_enable,
|
|
|
|
|
.atomic_disable = mxsfb_crtc_atomic_disable,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct drm_crtc_funcs mxsfb_crtc_funcs = {
|
|
|
|
|
.reset = drm_atomic_helper_crtc_reset,
|
|
|
|
|
.destroy = drm_crtc_cleanup,
|
|
|
|
|
.set_config = drm_atomic_helper_set_config,
|
|
|
|
|
.page_flip = drm_atomic_helper_page_flip,
|
|
|
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
|
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
|
|
|
|
.enable_vblank = mxsfb_crtc_enable_vblank,
|
|
|
|
|
.disable_vblank = mxsfb_crtc_disable_vblank,
|
|
|
|
|
};
|
|
|
|
|
|
drm: mxsfb: Implement LCDIF scanout CRC32 support
The LCDIF controller as present in i.MX28/i.MX6SX/i.MX8M Mini/Nano has
CRC_STAT register, which contains CRC32 of the frame as it was clocked
out of the DPI interface of the LCDIF. This is most likely meant as a
functional safety feature.
Unfortunately, there is zero documentation on how the CRC32 is calculated,
there is no documentation of the polynomial, the init value, nor on which
data is the checksum applied.
By applying brute-force on 8 pixel / 2 line frame, which is the minimum
size LCDIF would work with, it turns out the polynomial is CRC32_POLY_LE
0xedb88320 , init value is 0xffffffff , the input data are bitrev32()
of the entire frame and the resulting CRC has to be also bitrev32()ed.
Doing this calculation in kernel for each frame is unrealistic due to the
CPU demand, so attach the CRC collected from hardware to a frame instead.
The DRM subsystem already has an interface for this purpose and the CRC
can be accessed e.g. via debugfs:
"
$ echo auto > /sys/kernel/debug/dri/1/crtc-0/crc/control
$ cat /sys/kernel/debug/dri/1/crtc-0/crc/data
0x0000408c 0xa4e5cdd8
0x0000408d 0x72f537b4
"
The per-frame CRC can be used by userspace e.g. during automated testing,
to verify that whatever buffer was sent to be scanned out was actually
scanned out of the LCDIF correctly.
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Stein <alexander.stein@ew.tq-group.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Robby Cai <robby.cai@nxp.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429212313.305556-1-marex@denx.de
2022-04-29 23:23:13 +02:00
|
|
|
static const struct drm_crtc_funcs mxsfb_crtc_with_crc_funcs = {
|
|
|
|
|
.reset = drm_atomic_helper_crtc_reset,
|
|
|
|
|
.destroy = drm_crtc_cleanup,
|
|
|
|
|
.set_config = drm_atomic_helper_set_config,
|
|
|
|
|
.page_flip = drm_atomic_helper_page_flip,
|
|
|
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
|
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
|
|
|
|
.enable_vblank = mxsfb_crtc_enable_vblank,
|
|
|
|
|
.disable_vblank = mxsfb_crtc_disable_vblank,
|
|
|
|
|
.set_crc_source = mxsfb_crtc_set_crc_source,
|
|
|
|
|
.verify_crc_source = mxsfb_crtc_verify_crc_source,
|
|
|
|
|
};
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
|
* Encoder
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static const struct drm_encoder_funcs mxsfb_encoder_funcs = {
|
|
|
|
|
.destroy = drm_encoder_cleanup,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
|
* Planes
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int mxsfb_plane_atomic_check(struct drm_plane *plane,
|
drm/atomic: Pass the full state to planes atomic_check
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_check.
The conversion was done using the coccinelle script below plus some
manual changes for vmwgfx, built tested on all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
int (*atomic_check)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier dev;
identifier plane, plane_state, state;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<+...
- FUNCS->atomic_check(plane, plane_state)
+ FUNCS->atomic_check(plane, state)
...+>
}
@ ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
... when != new_plane_state
}
@ adds_new_state depends on plane_atomic_func && !ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
+ struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *new_plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-4-maxime@cerno.tech
2021-02-19 13:00:24 +01:00
|
|
|
struct drm_atomic_state *state)
|
2020-07-27 05:06:43 +03:00
|
|
|
{
|
drm/atomic: Pass the full state to planes atomic_check
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_check.
The conversion was done using the coccinelle script below plus some
manual changes for vmwgfx, built tested on all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
int (*atomic_check)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier dev;
identifier plane, plane_state, state;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<+...
- FUNCS->atomic_check(plane, plane_state)
+ FUNCS->atomic_check(plane, state)
...+>
}
@ ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
... when != new_plane_state
}
@ adds_new_state depends on plane_atomic_func && !ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
+ struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *new_plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-4-maxime@cerno.tech
2021-02-19 13:00:24 +01:00
|
|
|
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state,
|
|
|
|
|
plane);
|
2020-07-27 05:06:43 +03:00
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
|
|
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
|
|
drm: Use the state pointer directly in planes atomic_check
Now that atomic_check takes the global atomic state as a parameter, we
don't need to go through the pointer in the plane state.
This was done using the following coccinelle script:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_plane_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
- struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
<... when != plane_state
- plane_state->state
+ state
...>
}
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
<...
- plane_state->state
+ state
...>
}
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-5-maxime@cerno.tech
2021-02-19 13:00:25 +01:00
|
|
|
crtc_state = drm_atomic_get_new_crtc_state(state,
|
2020-07-27 05:06:43 +03:00
|
|
|
&mxsfb->crtc);
|
|
|
|
|
|
|
|
|
|
return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
|
2022-07-20 10:30:54 +02:00
|
|
|
DRM_PLANE_NO_SCALING,
|
|
|
|
|
DRM_PLANE_NO_SCALING,
|
2020-07-27 05:06:43 +03:00
|
|
|
false, true);
|
2016-08-18 20:23:01 +02:00
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
static void mxsfb_plane_primary_atomic_update(struct drm_plane *plane,
|
drm/atomic: Pass the full state to planes atomic disable and update
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.
The conversion was done using the coccinelle script below, built tested on
all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_update)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_disable)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@
f(struct drm_crtc_state *crtc_state)
{
...
struct drm_atomic_state *state = e;
<+...
(
- FUNCS->atomic_disable(plane, plane_state)
+ FUNCS->atomic_disable(plane, state)
|
- FUNCS->atomic_update(plane, plane_state)
+ FUNCS->atomic_update(plane, state)
)
...+>
}
@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *old_plane_state)
{
<...
- state
+ old_plane_state
...>
}
@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *plane_state)
{
+ struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
<+...
- plane_state->state
+ state
...+>
}
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-9-maxime@cerno.tech
2021-02-19 13:00:29 +01:00
|
|
|
struct drm_atomic_state *state)
|
2016-08-18 20:23:01 +02:00
|
|
|
{
|
2020-07-27 05:06:43 +03:00
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
|
2022-04-17 04:07:58 +02:00
|
|
|
struct drm_plane_state *new_pstate = drm_atomic_get_new_plane_state(state,
|
|
|
|
|
plane);
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr_t dma_addr;
|
2016-08-18 20:23:01 +02:00
|
|
|
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
|
|
|
|
|
if (dma_addr)
|
|
|
|
|
writel(dma_addr, mxsfb->base + mxsfb->devdata->next_buf);
|
2016-08-18 20:23:01 +02:00
|
|
|
}
|
2020-07-27 05:06:43 +03:00
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane,
|
drm/atomic: Pass the full state to planes atomic disable and update
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.
The conversion was done using the coccinelle script below, built tested on
all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_update)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_disable)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@
f(struct drm_crtc_state *crtc_state)
{
...
struct drm_atomic_state *state = e;
<+...
(
- FUNCS->atomic_disable(plane, plane_state)
+ FUNCS->atomic_disable(plane, state)
|
- FUNCS->atomic_update(plane, plane_state)
+ FUNCS->atomic_update(plane, state)
)
...+>
}
@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *old_plane_state)
{
<...
- state
+ old_plane_state
...>
}
@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *plane_state)
{
+ struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
<+...
- plane_state->state
+ state
...+>
}
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-9-maxime@cerno.tech
2021-02-19 13:00:29 +01:00
|
|
|
struct drm_atomic_state *state)
|
2020-07-27 05:06:54 +03:00
|
|
|
{
|
drm/atomic: Pass the full state to planes atomic disable and update
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.
The conversion was done using the coccinelle script below, built tested on
all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_update)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_disable)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@
f(struct drm_crtc_state *crtc_state)
{
...
struct drm_atomic_state *state = e;
<+...
(
- FUNCS->atomic_disable(plane, plane_state)
+ FUNCS->atomic_disable(plane, state)
|
- FUNCS->atomic_update(plane, plane_state)
+ FUNCS->atomic_update(plane, state)
)
...+>
}
@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *old_plane_state)
{
<...
- state
+ old_plane_state
...>
}
@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *plane_state)
{
+ struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
<+...
- plane_state->state
+ state
...+>
}
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-9-maxime@cerno.tech
2021-02-19 13:00:29 +01:00
|
|
|
struct drm_plane_state *old_pstate = drm_atomic_get_old_plane_state(state,
|
|
|
|
|
plane);
|
2020-07-27 05:06:54 +03:00
|
|
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
|
drm: Use state helper instead of the plane state pointer
Many drivers reference the plane->state pointer in order to get the
current plane state in their atomic_update or atomic_disable hooks,
which would be the new plane state in the global atomic state since
_swap_state happened when those hooks are run.
Use the drm_atomic_get_new_plane_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
)
@ adds_new_state @
identifier plane_atomic_func.func;
identifier plane, state;
identifier new_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state)
{
...
- struct drm_plane_state *new_state = plane->state;
+ struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane);
...
}
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:30 +01:00
|
|
|
struct drm_plane_state *new_pstate = drm_atomic_get_new_plane_state(state,
|
|
|
|
|
plane);
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr_t dma_addr;
|
2020-07-27 05:06:54 +03:00
|
|
|
u32 ctrl;
|
|
|
|
|
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
|
|
|
|
|
if (!dma_addr) {
|
2020-07-27 05:06:54 +03:00
|
|
|
writel(0, mxsfb->base + LCDC_AS_CTRL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* HACK: The hardware seems to output 64 bytes of data of unknown
|
|
|
|
|
* origin, and then to proceed with the framebuffer. Until the reason
|
|
|
|
|
* is understood, live with the 16 initial invalid pixels on the first
|
|
|
|
|
* line and start 64 bytes within the framebuffer.
|
|
|
|
|
*/
|
2022-08-02 02:04:04 +02:00
|
|
|
dma_addr += 64;
|
2020-07-27 05:06:54 +03:00
|
|
|
|
2022-08-02 02:04:04 +02:00
|
|
|
writel(dma_addr, mxsfb->base + LCDC_AS_NEXT_BUF);
|
2020-07-27 05:06:54 +03:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If the plane was previously disabled, write LCDC_AS_BUF as well to
|
|
|
|
|
* provide the first buffer.
|
|
|
|
|
*/
|
|
|
|
|
if (!old_pstate->fb)
|
2022-08-02 02:04:04 +02:00
|
|
|
writel(dma_addr, mxsfb->base + LCDC_AS_BUF);
|
2020-07-27 05:06:54 +03:00
|
|
|
|
|
|
|
|
ctrl = AS_CTRL_AS_ENABLE | AS_CTRL_ALPHA(255);
|
|
|
|
|
|
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
|
|
|
switch (new_pstate->fb->format->format) {
|
2020-07-27 05:06:54 +03:00
|
|
|
case DRM_FORMAT_XRGB4444:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_RGB444 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_ARGB4444:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_ARGB4444 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_XRGB1555:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_RGB555 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_ARGB1555:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_ARGB1555 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_RGB565 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_RGB888 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
|
|
|
|
|
break;
|
|
|
|
|
case DRM_FORMAT_ARGB8888:
|
|
|
|
|
ctrl |= AS_CTRL_FORMAT_ARGB8888 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
writel(ctrl, mxsfb->base + LCDC_AS_CTRL);
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-08 21:00:01 +00:00
|
|
|
static bool mxsfb_format_mod_supported(struct drm_plane *plane,
|
|
|
|
|
uint32_t format,
|
|
|
|
|
uint64_t modifier)
|
|
|
|
|
{
|
|
|
|
|
return modifier == DRM_FORMAT_MOD_LINEAR;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs = {
|
|
|
|
|
.atomic_check = mxsfb_plane_atomic_check,
|
|
|
|
|
.atomic_update = mxsfb_plane_primary_atomic_update,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = {
|
2020-07-27 05:06:43 +03:00
|
|
|
.atomic_check = mxsfb_plane_atomic_check,
|
2020-07-27 05:06:54 +03:00
|
|
|
.atomic_update = mxsfb_plane_overlay_atomic_update,
|
2020-07-27 05:06:43 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct drm_plane_funcs mxsfb_plane_funcs = {
|
2020-11-08 21:00:01 +00:00
|
|
|
.format_mod_supported = mxsfb_format_mod_supported,
|
2020-07-27 05:06:43 +03:00
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
|
.destroy = drm_plane_cleanup,
|
|
|
|
|
.reset = drm_atomic_helper_plane_reset,
|
|
|
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
|
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
|
|
|
};
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
static const uint32_t mxsfb_primary_plane_formats[] = {
|
|
|
|
|
DRM_FORMAT_RGB565,
|
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const uint32_t mxsfb_overlay_plane_formats[] = {
|
|
|
|
|
DRM_FORMAT_XRGB4444,
|
|
|
|
|
DRM_FORMAT_ARGB4444,
|
|
|
|
|
DRM_FORMAT_XRGB1555,
|
|
|
|
|
DRM_FORMAT_ARGB1555,
|
|
|
|
|
DRM_FORMAT_RGB565,
|
2020-07-27 05:06:43 +03:00
|
|
|
DRM_FORMAT_XRGB8888,
|
2020-07-27 05:06:54 +03:00
|
|
|
DRM_FORMAT_ARGB8888,
|
2020-07-27 05:06:43 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const uint64_t mxsfb_modifiers[] = {
|
|
|
|
|
DRM_FORMAT_MOD_LINEAR,
|
|
|
|
|
DRM_FORMAT_MOD_INVALID
|
|
|
|
|
};
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
|
* Initialization
|
|
|
|
|
*/
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb)
|
|
|
|
|
{
|
|
|
|
|
struct drm_encoder *encoder = &mxsfb->encoder;
|
|
|
|
|
struct drm_crtc *crtc = &mxsfb->crtc;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
drm_plane_helper_add(&mxsfb->planes.primary,
|
|
|
|
|
&mxsfb_plane_primary_helper_funcs);
|
|
|
|
|
ret = drm_universal_plane_init(mxsfb->drm, &mxsfb->planes.primary, 1,
|
|
|
|
|
&mxsfb_plane_funcs,
|
|
|
|
|
mxsfb_primary_plane_formats,
|
|
|
|
|
ARRAY_SIZE(mxsfb_primary_plane_formats),
|
2020-07-27 05:06:43 +03:00
|
|
|
mxsfb_modifiers, DRM_PLANE_TYPE_PRIMARY,
|
|
|
|
|
NULL);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-07-27 05:06:54 +03:00
|
|
|
if (mxsfb->devdata->has_overlay) {
|
|
|
|
|
drm_plane_helper_add(&mxsfb->planes.overlay,
|
|
|
|
|
&mxsfb_plane_overlay_helper_funcs);
|
|
|
|
|
ret = drm_universal_plane_init(mxsfb->drm,
|
|
|
|
|
&mxsfb->planes.overlay, 1,
|
|
|
|
|
&mxsfb_plane_funcs,
|
|
|
|
|
mxsfb_overlay_plane_formats,
|
|
|
|
|
ARRAY_SIZE(mxsfb_overlay_plane_formats),
|
|
|
|
|
mxsfb_modifiers, DRM_PLANE_TYPE_OVERLAY,
|
|
|
|
|
NULL);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-27 05:06:43 +03:00
|
|
|
drm_crtc_helper_add(crtc, &mxsfb_crtc_helper_funcs);
|
drm: mxsfb: Implement LCDIF scanout CRC32 support
The LCDIF controller as present in i.MX28/i.MX6SX/i.MX8M Mini/Nano has
CRC_STAT register, which contains CRC32 of the frame as it was clocked
out of the DPI interface of the LCDIF. This is most likely meant as a
functional safety feature.
Unfortunately, there is zero documentation on how the CRC32 is calculated,
there is no documentation of the polynomial, the init value, nor on which
data is the checksum applied.
By applying brute-force on 8 pixel / 2 line frame, which is the minimum
size LCDIF would work with, it turns out the polynomial is CRC32_POLY_LE
0xedb88320 , init value is 0xffffffff , the input data are bitrev32()
of the entire frame and the resulting CRC has to be also bitrev32()ed.
Doing this calculation in kernel for each frame is unrealistic due to the
CPU demand, so attach the CRC collected from hardware to a frame instead.
The DRM subsystem already has an interface for this purpose and the CRC
can be accessed e.g. via debugfs:
"
$ echo auto > /sys/kernel/debug/dri/1/crtc-0/crc/control
$ cat /sys/kernel/debug/dri/1/crtc-0/crc/data
0x0000408c 0xa4e5cdd8
0x0000408d 0x72f537b4
"
The per-frame CRC can be used by userspace e.g. during automated testing,
to verify that whatever buffer was sent to be scanned out was actually
scanned out of the LCDIF correctly.
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Stein <alexander.stein@ew.tq-group.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Robby Cai <robby.cai@nxp.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429212313.305556-1-marex@denx.de
2022-04-29 23:23:13 +02:00
|
|
|
if (mxsfb->devdata->has_crc32) {
|
|
|
|
|
ret = drm_crtc_init_with_planes(mxsfb->drm, crtc,
|
|
|
|
|
&mxsfb->planes.primary, NULL,
|
|
|
|
|
&mxsfb_crtc_with_crc_funcs,
|
|
|
|
|
NULL);
|
|
|
|
|
} else {
|
|
|
|
|
ret = drm_crtc_init_with_planes(mxsfb->drm, crtc,
|
|
|
|
|
&mxsfb->planes.primary, NULL,
|
|
|
|
|
&mxsfb_crtc_funcs, NULL);
|
|
|
|
|
}
|
2020-07-27 05:06:43 +03:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
encoder->possible_crtcs = drm_crtc_mask(crtc);
|
|
|
|
|
return drm_encoder_init(mxsfb->drm, encoder, &mxsfb_encoder_funcs,
|
|
|
|
|
DRM_MODE_ENCODER_NONE, NULL);
|
|
|
|
|
}
|
