2019-06-04 10:11:33 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2012-08-15 13:59:49 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2012 Russell King
|
|
|
|
* Rewritten from the dovefb driver, and Armada510 manuals.
|
|
|
|
*/
|
2019-08-04 11:41:31 +02:00
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
#include <linux/clk.h>
|
2014-04-22 11:10:15 +01:00
|
|
|
#include <linux/component.h>
|
2019-08-04 11:41:31 +02:00
|
|
|
#include <linux/module.h>
|
2014-04-22 11:10:15 +01:00
|
|
|
#include <linux/of_device.h>
|
|
|
|
#include <linux/platform_device.h>
|
2019-08-04 11:41:31 +02:00
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
#include <drm/drm_atomic.h>
|
2018-01-05 09:43:46 +10:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2019-08-04 11:41:31 +02:00
|
|
|
#include <drm/drm_plane_helper.h>
|
|
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
#include <drm/drm_vblank.h>
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
#include "armada_crtc.h"
|
|
|
|
#include "armada_drm.h"
|
|
|
|
#include "armada_fb.h"
|
|
|
|
#include "armada_gem.h"
|
|
|
|
#include "armada_hw.h"
|
2018-07-30 11:52:34 +01:00
|
|
|
#include "armada_plane.h"
|
2016-05-17 13:51:08 +01:00
|
|
|
#include "armada_trace.h"
|
2012-08-15 13:59:49 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* A note about interlacing. Let's consider HDMI 1920x1080i.
|
|
|
|
* The timing parameters we have from X are:
|
|
|
|
* Hact HsyA HsyI Htot Vact VsyA VsyI Vtot
|
|
|
|
* 1920 2448 2492 2640 1080 1084 1094 1125
|
|
|
|
* Which get translated to:
|
|
|
|
* Hact HsyA HsyI Htot Vact VsyA VsyI Vtot
|
|
|
|
* 1920 2448 2492 2640 540 542 547 562
|
|
|
|
*
|
|
|
|
* This is how it is defined by CEA-861-D - line and pixel numbers are
|
|
|
|
* referenced to the rising edge of VSYNC and HSYNC. Total clocks per
|
|
|
|
* line: 2640. The odd frame, the first active line is at line 21, and
|
|
|
|
* the even frame, the first active line is 584.
|
|
|
|
*
|
|
|
|
* LN: 560 561 562 563 567 568 569
|
|
|
|
* DE: ~~~|____________________________//__________________________
|
|
|
|
* HSYNC: ____|~|_____|~|_____|~|_____|~|_//__|~|_____|~|_____|~|_____
|
|
|
|
* VSYNC: _________________________|~~~~~~//~~~~~~~~~~~~~~~|__________
|
|
|
|
* 22 blanking lines. VSYNC at 1320 (referenced to the HSYNC rising edge).
|
|
|
|
*
|
|
|
|
* LN: 1123 1124 1125 1 5 6 7
|
|
|
|
* DE: ~~~|____________________________//__________________________
|
|
|
|
* HSYNC: ____|~|_____|~|_____|~|_____|~|_//__|~|_____|~|_____|~|_____
|
|
|
|
* VSYNC: ____________________|~~~~~~~~~~~//~~~~~~~~~~|_______________
|
|
|
|
* 23 blanking lines
|
|
|
|
*
|
|
|
|
* The Armada LCD Controller line and pixel numbers are, like X timings,
|
|
|
|
* referenced to the top left of the active frame.
|
|
|
|
*
|
|
|
|
* So, translating these to our LCD controller:
|
|
|
|
* Odd frame, 563 total lines, VSYNC at line 543-548, pixel 1128.
|
|
|
|
* Even frame, 562 total lines, VSYNC at line 542-547, pixel 2448.
|
|
|
|
* Note: Vsync front porch remains constant!
|
|
|
|
*
|
|
|
|
* if (odd_frame) {
|
|
|
|
* vtotal = mode->crtc_vtotal + 1;
|
|
|
|
* vbackporch = mode->crtc_vsync_start - mode->crtc_vdisplay + 1;
|
|
|
|
* vhorizpos = mode->crtc_hsync_start - mode->crtc_htotal / 2
|
|
|
|
* } else {
|
|
|
|
* vtotal = mode->crtc_vtotal;
|
|
|
|
* vbackporch = mode->crtc_vsync_start - mode->crtc_vdisplay;
|
|
|
|
* vhorizpos = mode->crtc_hsync_start;
|
|
|
|
* }
|
|
|
|
* vfrontporch = mode->crtc_vtotal - mode->crtc_vsync_end;
|
|
|
|
*
|
|
|
|
* So, we need to reprogram these registers on each vsync event:
|
|
|
|
* LCD_SPU_V_PORCH, LCD_SPU_ADV_REG, LCD_SPUT_V_H_TOTAL
|
|
|
|
*
|
|
|
|
* Note: we do not use the frame done interrupts because these appear
|
|
|
|
* to happen too early, and lead to jitter on the display (presumably
|
|
|
|
* they occur at the end of the last active line, before the vsync back
|
|
|
|
* porch, which we're reprogramming.)
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
armada_drm_crtc_update_regs(struct armada_crtc *dcrtc, struct armada_regs *regs)
|
|
|
|
{
|
|
|
|
while (regs->offset != ~0) {
|
|
|
|
void __iomem *reg = dcrtc->base + regs->offset;
|
|
|
|
uint32_t val;
|
|
|
|
|
|
|
|
val = regs->mask;
|
|
|
|
if (val != 0)
|
|
|
|
val &= readl_relaxed(reg);
|
|
|
|
writel_relaxed(val | regs->val, reg);
|
|
|
|
++regs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
static void armada_drm_crtc_update(struct armada_crtc *dcrtc, bool enable)
|
2012-08-15 13:59:49 +01:00
|
|
|
{
|
|
|
|
uint32_t dumb_ctrl;
|
|
|
|
|
|
|
|
dumb_ctrl = dcrtc->cfg_dumb_ctrl;
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
if (enable)
|
2012-08-15 13:59:49 +01:00
|
|
|
dumb_ctrl |= CFG_DUMB_ENA;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When the dumb interface isn't in DUMB24_RGB888_0 mode, it might
|
|
|
|
* be using SPI or GPIO. If we set this to DUMB_BLANK, we will
|
|
|
|
* force LCD_D[23:0] to output blank color, overriding the GPIO or
|
|
|
|
* SPI usage. So leave it as-is unless in DUMB24_RGB888_0 mode.
|
|
|
|
*/
|
2018-07-30 11:52:34 +01:00
|
|
|
if (!enable && (dumb_ctrl & DUMB_MASK) == DUMB24_RGB888_0) {
|
2012-08-15 13:59:49 +01:00
|
|
|
dumb_ctrl &= ~DUMB_MASK;
|
|
|
|
dumb_ctrl |= DUMB_BLANK;
|
|
|
|
}
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
armada_updatel(dumb_ctrl,
|
|
|
|
~(CFG_INV_CSYNC | CFG_INV_HSYNC | CFG_INV_VSYNC),
|
|
|
|
dcrtc->base + LCD_SPU_DUMB_CTRL);
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
static void armada_drm_crtc_queue_state_event(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
struct drm_pending_vblank_event *event;
|
|
|
|
|
|
|
|
/* If we have an event, we need vblank events enabled */
|
|
|
|
event = xchg(&crtc->state->event, NULL);
|
|
|
|
if (event) {
|
|
|
|
WARN_ON(drm_crtc_vblank_get(crtc) != 0);
|
|
|
|
dcrtc->event = event;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-01 15:46:26 +01:00
|
|
|
static void armada_drm_update_gamma(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_property_blob *blob = crtc->state->gamma_lut;
|
|
|
|
void __iomem *base = drm_to_armada_crtc(crtc)->base;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (blob) {
|
|
|
|
struct drm_color_lut *lut = blob->data;
|
|
|
|
|
|
|
|
armada_updatel(CFG_CSB_256x8, CFG_CSB_256x8 | CFG_PDWN256x8,
|
|
|
|
base + LCD_SPU_SRAM_PARA1);
|
|
|
|
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
writel_relaxed(drm_color_lut_extract(lut[i].red, 8),
|
|
|
|
base + LCD_SPU_SRAM_WRDAT);
|
|
|
|
writel_relaxed(i | SRAM_WRITE | SRAM_GAMMA_YR,
|
|
|
|
base + LCD_SPU_SRAM_CTRL);
|
|
|
|
readl_relaxed(base + LCD_SPU_HWC_OVSA_HPXL_VLN);
|
|
|
|
writel_relaxed(drm_color_lut_extract(lut[i].green, 8),
|
|
|
|
base + LCD_SPU_SRAM_WRDAT);
|
|
|
|
writel_relaxed(i | SRAM_WRITE | SRAM_GAMMA_UG,
|
|
|
|
base + LCD_SPU_SRAM_CTRL);
|
|
|
|
readl_relaxed(base + LCD_SPU_HWC_OVSA_HPXL_VLN);
|
|
|
|
writel_relaxed(drm_color_lut_extract(lut[i].blue, 8),
|
|
|
|
base + LCD_SPU_SRAM_WRDAT);
|
|
|
|
writel_relaxed(i | SRAM_WRITE | SRAM_GAMMA_VB,
|
|
|
|
base + LCD_SPU_SRAM_CTRL);
|
|
|
|
readl_relaxed(base + LCD_SPU_HWC_OVSA_HPXL_VLN);
|
|
|
|
}
|
|
|
|
armada_updatel(CFG_GAMMA_ENA, CFG_GAMMA_ENA,
|
|
|
|
base + LCD_SPU_DMA_CTRL0);
|
|
|
|
} else {
|
|
|
|
armada_updatel(0, CFG_GAMMA_ENA, base + LCD_SPU_DMA_CTRL0);
|
|
|
|
armada_updatel(CFG_PDWN256x8, CFG_CSB_256x8 | CFG_PDWN256x8,
|
|
|
|
base + LCD_SPU_SRAM_PARA1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-14 11:17:45 +01:00
|
|
|
static enum drm_mode_status armada_drm_crtc_mode_valid(struct drm_crtc *crtc,
|
|
|
|
const struct drm_display_mode *mode)
|
|
|
|
{
|
2018-07-14 11:17:49 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
|
2018-07-14 11:17:45 +01:00
|
|
|
if (mode->vscan > 1)
|
|
|
|
return MODE_NO_VSCAN;
|
|
|
|
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
|
|
|
|
return MODE_NO_DBLESCAN;
|
|
|
|
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_HSKEW)
|
|
|
|
return MODE_H_ILLEGAL;
|
|
|
|
|
2018-07-14 11:17:49 +01:00
|
|
|
/* We can't do interlaced modes if we don't have the SPU_ADV_REG */
|
|
|
|
if (!dcrtc->variant->has_spu_adv_reg &&
|
|
|
|
mode->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
return MODE_NO_INTERLACE;
|
|
|
|
|
2018-07-14 11:17:45 +01:00
|
|
|
if (mode->flags & (DRM_MODE_FLAG_BCAST | DRM_MODE_FLAG_PIXMUX |
|
|
|
|
DRM_MODE_FLAG_CLKDIV2))
|
|
|
|
return MODE_BAD;
|
|
|
|
|
|
|
|
return MODE_OK;
|
|
|
|
}
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
/* The mode_config.mutex will be held for this call */
|
|
|
|
static bool armada_drm_crtc_mode_fixup(struct drm_crtc *crtc,
|
|
|
|
const struct drm_display_mode *mode, struct drm_display_mode *adj)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
int ret;
|
|
|
|
|
2018-07-01 15:46:56 +01:00
|
|
|
/*
|
|
|
|
* Set CRTC modesetting parameters for the adjusted mode. This is
|
|
|
|
* applied after the connectors, bridges, and encoders have fixed up
|
|
|
|
* this mode, as described above drm_atomic_helper_check_modeset().
|
|
|
|
*/
|
|
|
|
drm_mode_set_crtcinfo(adj, CRTC_INTERLACE_HALVE_V);
|
|
|
|
|
2018-07-14 11:17:49 +01:00
|
|
|
/*
|
|
|
|
* Validate the adjusted mode in case an encoder/bridge has set
|
|
|
|
* something we don't support.
|
|
|
|
*/
|
|
|
|
if (armada_drm_crtc_mode_valid(crtc, adj) != MODE_OK)
|
2012-08-15 13:59:49 +01:00
|
|
|
return false;
|
|
|
|
|
|
|
|
/* Check whether the display mode is possible */
|
2014-04-22 15:24:03 +01:00
|
|
|
ret = dcrtc->variant->compute_clock(dcrtc, adj, NULL);
|
2012-08-15 13:59:49 +01:00
|
|
|
if (ret)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-02-07 17:16:18 +08:00
|
|
|
/* These are locked by dev->vbl_lock */
|
|
|
|
static void armada_drm_crtc_disable_irq(struct armada_crtc *dcrtc, u32 mask)
|
|
|
|
{
|
|
|
|
if (dcrtc->irq_ena & mask) {
|
|
|
|
dcrtc->irq_ena &= ~mask;
|
|
|
|
writel(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armada_drm_crtc_enable_irq(struct armada_crtc *dcrtc, u32 mask)
|
|
|
|
{
|
|
|
|
if ((dcrtc->irq_ena & mask) != mask) {
|
|
|
|
dcrtc->irq_ena |= mask;
|
|
|
|
writel(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA);
|
|
|
|
if (readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR) & mask)
|
|
|
|
writel(0, dcrtc->base + LCD_SPU_IRQ_ISR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-26 15:19:38 +01:00
|
|
|
static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)
|
2012-08-15 13:59:49 +01:00
|
|
|
{
|
2018-07-30 11:52:34 +01:00
|
|
|
struct drm_pending_vblank_event *event;
|
2012-08-15 13:59:49 +01:00
|
|
|
void __iomem *base = dcrtc->base;
|
|
|
|
|
|
|
|
if (stat & DMA_FF_UNDERFLOW)
|
|
|
|
DRM_ERROR("video underflow on crtc %u\n", dcrtc->num);
|
|
|
|
if (stat & GRA_FF_UNDERFLOW)
|
|
|
|
DRM_ERROR("graphics underflow on crtc %u\n", dcrtc->num);
|
|
|
|
|
|
|
|
if (stat & VSYNC_IRQ)
|
2016-07-04 21:04:48 -03:00
|
|
|
drm_crtc_handle_vblank(&dcrtc->crtc);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
2017-07-08 10:16:48 +01:00
|
|
|
spin_lock(&dcrtc->irq_lock);
|
2012-08-15 13:59:49 +01:00
|
|
|
if (stat & GRA_FRAME_IRQ && dcrtc->interlaced) {
|
|
|
|
int i = stat & GRA_FRAME_IRQ0 ? 0 : 1;
|
|
|
|
uint32_t val;
|
|
|
|
|
|
|
|
writel_relaxed(dcrtc->v[i].spu_v_porch, base + LCD_SPU_V_PORCH);
|
|
|
|
writel_relaxed(dcrtc->v[i].spu_v_h_total,
|
|
|
|
base + LCD_SPUT_V_H_TOTAL);
|
|
|
|
|
|
|
|
val = readl_relaxed(base + LCD_SPU_ADV_REG);
|
|
|
|
val &= ~(ADV_VSYNC_L_OFF | ADV_VSYNC_H_OFF | ADV_VSYNCOFFEN);
|
|
|
|
val |= dcrtc->v[i].spu_adv_reg;
|
2013-05-19 10:55:17 +01:00
|
|
|
writel_relaxed(val, base + LCD_SPU_ADV_REG);
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
2013-05-19 10:55:17 +01:00
|
|
|
|
2018-07-30 11:53:06 +01:00
|
|
|
if (stat & dcrtc->irq_ena & DUMB_FRAMEDONE) {
|
|
|
|
if (dcrtc->update_pending) {
|
|
|
|
armada_drm_crtc_update_regs(dcrtc, dcrtc->regs);
|
|
|
|
dcrtc->update_pending = false;
|
|
|
|
}
|
|
|
|
if (dcrtc->cursor_update) {
|
|
|
|
writel_relaxed(dcrtc->cursor_hw_pos,
|
|
|
|
base + LCD_SPU_HWC_OVSA_HPXL_VLN);
|
|
|
|
writel_relaxed(dcrtc->cursor_hw_sz,
|
|
|
|
base + LCD_SPU_HWC_HPXL_VLN);
|
|
|
|
armada_updatel(CFG_HWC_ENA,
|
|
|
|
CFG_HWC_ENA | CFG_HWC_1BITMOD |
|
|
|
|
CFG_HWC_1BITENA,
|
|
|
|
base + LCD_SPU_DMA_CTRL0);
|
|
|
|
dcrtc->cursor_update = false;
|
|
|
|
}
|
2013-05-19 10:55:17 +01:00
|
|
|
armada_drm_crtc_disable_irq(dcrtc, DUMB_FRAMEDONE_ENA);
|
|
|
|
}
|
2012-08-15 13:59:49 +01:00
|
|
|
spin_unlock(&dcrtc->irq_lock);
|
|
|
|
|
2018-07-30 11:53:06 +01:00
|
|
|
if (stat & VSYNC_IRQ && !dcrtc->update_pending) {
|
2018-07-30 11:52:34 +01:00
|
|
|
event = xchg(&dcrtc->event, NULL);
|
|
|
|
if (event) {
|
|
|
|
spin_lock(&dcrtc->crtc.dev->event_lock);
|
|
|
|
drm_crtc_send_vblank_event(&dcrtc->crtc, event);
|
|
|
|
spin_unlock(&dcrtc->crtc.dev->event_lock);
|
|
|
|
drm_crtc_vblank_put(&dcrtc->crtc);
|
|
|
|
}
|
|
|
|
}
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
|
|
|
|
2014-04-26 15:19:38 +01:00
|
|
|
static irqreturn_t armada_drm_irq(int irq, void *arg)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = arg;
|
|
|
|
u32 v, stat = readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
|
|
|
|
|
|
|
|
/*
|
2018-06-26 17:06:06 +01:00
|
|
|
* Reading the ISR appears to clear bits provided CLEAN_SPU_IRQ_ISR
|
|
|
|
* is set. Writing has some other effect to acknowledge the IRQ -
|
|
|
|
* without this, we only get a single IRQ.
|
2014-04-26 15:19:38 +01:00
|
|
|
*/
|
|
|
|
writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
|
|
|
|
|
2016-05-17 13:51:08 +01:00
|
|
|
trace_armada_drm_irq(&dcrtc->crtc, stat);
|
|
|
|
|
2014-04-26 15:19:38 +01:00
|
|
|
/* Mask out those interrupts we haven't enabled */
|
|
|
|
v = stat & dcrtc->irq_ena;
|
|
|
|
|
|
|
|
if (v & (VSYNC_IRQ|GRA_FRAME_IRQ|DUMB_FRAMEDONE)) {
|
|
|
|
armada_drm_crtc_irq(dcrtc, stat);
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
return IRQ_NONE;
|
|
|
|
}
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
/* The mode_config.mutex will be held for this call */
|
2018-07-30 11:52:34 +01:00
|
|
|
static void armada_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
|
2012-08-15 13:59:49 +01:00
|
|
|
{
|
2018-07-30 11:52:34 +01:00
|
|
|
struct drm_display_mode *adj = &crtc->state->adjusted_mode;
|
2012-08-15 13:59:49 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
struct armada_regs regs[17];
|
|
|
|
uint32_t lm, rm, tm, bm, val, sclk;
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned i;
|
2018-07-30 11:52:34 +01:00
|
|
|
bool interlaced = !!(adj->flags & DRM_MODE_FLAG_INTERLACE);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
2016-08-16 22:09:09 +01:00
|
|
|
i = 0;
|
2012-08-15 13:59:49 +01:00
|
|
|
rm = adj->crtc_hsync_start - adj->crtc_hdisplay;
|
|
|
|
lm = adj->crtc_htotal - adj->crtc_hsync_end;
|
|
|
|
bm = adj->crtc_vsync_start - adj->crtc_vdisplay;
|
|
|
|
tm = adj->crtc_vtotal - adj->crtc_vsync_end;
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s] mode " DRM_MODE_FMT "\n",
|
2019-01-11 12:44:41 -02:00
|
|
|
crtc->base.id, crtc->name, DRM_MODE_ARG(adj));
|
2018-07-30 11:52:34 +01:00
|
|
|
DRM_DEBUG_KMS("lm %d rm %d tm %d bm %d\n", lm, rm, tm, bm);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
|
|
|
/* Now compute the divider for real */
|
2014-04-22 15:24:03 +01:00
|
|
|
dcrtc->variant->compute_clock(dcrtc, adj, &sclk);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
|
|
|
armada_reg_queue_set(regs, i, sclk, LCD_CFG_SCLK_DIV);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dcrtc->irq_lock, flags);
|
|
|
|
|
2019-01-25 09:47:05 +00:00
|
|
|
dcrtc->interlaced = interlaced;
|
2012-08-15 13:59:49 +01:00
|
|
|
/* Even interlaced/progressive frame */
|
|
|
|
dcrtc->v[1].spu_v_h_total = adj->crtc_vtotal << 16 |
|
|
|
|
adj->crtc_htotal;
|
|
|
|
dcrtc->v[1].spu_v_porch = tm << 16 | bm;
|
|
|
|
val = adj->crtc_hsync_start;
|
2018-07-30 11:52:34 +01:00
|
|
|
dcrtc->v[1].spu_adv_reg = val << 20 | val | ADV_VSYNCOFFEN;
|
2012-08-15 13:59:49 +01:00
|
|
|
|
|
|
|
if (interlaced) {
|
|
|
|
/* Odd interlaced frame */
|
2018-07-30 11:52:34 +01:00
|
|
|
val -= adj->crtc_htotal / 2;
|
|
|
|
dcrtc->v[0].spu_adv_reg = val << 20 | val | ADV_VSYNCOFFEN;
|
2012-08-15 13:59:49 +01:00
|
|
|
dcrtc->v[0].spu_v_h_total = dcrtc->v[1].spu_v_h_total +
|
|
|
|
(1 << 16);
|
|
|
|
dcrtc->v[0].spu_v_porch = dcrtc->v[1].spu_v_porch + 1;
|
|
|
|
} else {
|
|
|
|
dcrtc->v[0] = dcrtc->v[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
val = adj->crtc_vdisplay << 16 | adj->crtc_hdisplay;
|
|
|
|
|
|
|
|
armada_reg_queue_set(regs, i, val, LCD_SPU_V_H_ACTIVE);
|
|
|
|
armada_reg_queue_set(regs, i, (lm << 16) | rm, LCD_SPU_H_PORCH);
|
|
|
|
armada_reg_queue_set(regs, i, dcrtc->v[0].spu_v_porch, LCD_SPU_V_PORCH);
|
|
|
|
armada_reg_queue_set(regs, i, dcrtc->v[0].spu_v_h_total,
|
|
|
|
LCD_SPUT_V_H_TOTAL);
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
if (dcrtc->variant->has_spu_adv_reg)
|
2012-08-15 13:59:49 +01:00
|
|
|
armada_reg_queue_mod(regs, i, dcrtc->v[0].spu_adv_reg,
|
|
|
|
ADV_VSYNC_L_OFF | ADV_VSYNC_H_OFF |
|
|
|
|
ADV_VSYNCOFFEN, LCD_SPU_ADV_REG);
|
|
|
|
|
|
|
|
val = adj->flags & DRM_MODE_FLAG_NVSYNC ? CFG_VSYNC_INV : 0;
|
|
|
|
armada_reg_queue_mod(regs, i, val, CFG_VSYNC_INV, LCD_SPU_DMA_CTRL1);
|
2018-07-30 11:52:34 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The documentation doesn't indicate what the normal state of
|
|
|
|
* the sync signals are. Sebastian Hesselbart kindly probed
|
|
|
|
* these signals on his board to determine their state.
|
|
|
|
*
|
|
|
|
* The non-inverted state of the sync signals is active high.
|
|
|
|
* Setting these bits makes the appropriate signal active low.
|
|
|
|
*/
|
|
|
|
val = 0;
|
|
|
|
if (adj->flags & DRM_MODE_FLAG_NCSYNC)
|
|
|
|
val |= CFG_INV_CSYNC;
|
|
|
|
if (adj->flags & DRM_MODE_FLAG_NHSYNC)
|
|
|
|
val |= CFG_INV_HSYNC;
|
|
|
|
if (adj->flags & DRM_MODE_FLAG_NVSYNC)
|
|
|
|
val |= CFG_INV_VSYNC;
|
|
|
|
armada_reg_queue_mod(regs, i, val, CFG_INV_CSYNC | CFG_INV_HSYNC |
|
|
|
|
CFG_INV_VSYNC, LCD_SPU_DUMB_CTRL);
|
2012-08-15 13:59:49 +01:00
|
|
|
armada_reg_queue_end(regs, i);
|
|
|
|
|
|
|
|
armada_drm_crtc_update_regs(dcrtc, regs);
|
|
|
|
spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
|
|
|
|
}
|
|
|
|
|
2018-07-01 15:46:26 +01:00
|
|
|
static int armada_drm_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)
|
2018-07-01 15:46:26 +01: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);
|
2018-07-01 15:46:26 +01:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
|
|
|
|
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->gamma_lut && drm_color_lut_size(crtc_state->gamma_lut) != 256)
|
2018-07-01 15:46:26 +01:00
|
|
|
return -EINVAL;
|
|
|
|
|
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->color_mgmt_changed)
|
|
|
|
crtc_state->planes_changed = true;
|
2018-07-01 15:46:26 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
static void armada_drm_crtc_atomic_begin(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)
|
2018-07-30 11:52:34 +01:00
|
|
|
{
|
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ 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,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
|
|
|
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
|
|
|
|
crtc);
|
2018-07-30 11:52:34 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
|
|
|
|
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ 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,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
|
|
|
if (crtc_state->color_mgmt_changed)
|
2018-07-01 15:46:26 +01:00
|
|
|
armada_drm_update_gamma(crtc);
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
dcrtc->regs_idx = 0;
|
|
|
|
dcrtc->regs = dcrtc->atomic_regs;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armada_drm_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)
|
2018-07-30 11:52:34 +01:00
|
|
|
{
|
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ 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,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
|
|
|
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
|
|
|
|
crtc);
|
2018-07-30 11:52:34 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
|
|
|
|
|
|
|
armada_reg_queue_end(dcrtc->regs, dcrtc->regs_idx);
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
/*
|
|
|
|
* If we aren't doing a full modeset, then we need to queue
|
|
|
|
* the event here.
|
|
|
|
*/
|
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ 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,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
|
|
|
if (!drm_atomic_crtc_needs_modeset(crtc_state)) {
|
2018-07-30 11:53:06 +01:00
|
|
|
dcrtc->update_pending = true;
|
2018-07-30 11:52:34 +01:00
|
|
|
armada_drm_crtc_queue_state_event(crtc);
|
2018-07-30 11:53:06 +01:00
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
|
|
|
armada_drm_crtc_enable_irq(dcrtc, DUMB_FRAMEDONE_ENA);
|
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
|
|
|
} else {
|
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
|
|
|
armada_drm_crtc_update_regs(dcrtc, dcrtc->regs);
|
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
|
|
|
}
|
2018-07-30 11:52:34 +01:00
|
|
|
}
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
static void armada_drm_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)
|
2018-07-30 11:52:34 +01:00
|
|
|
{
|
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_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
|
|
|
|
crtc);
|
2018-07-30 11:52:34 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
struct drm_pending_vblank_event *event;
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
|
|
|
|
2019-01-25 09:47:05 +00:00
|
|
|
if (old_state->adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
drm_crtc_vblank_put(crtc);
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
drm_crtc_vblank_off(crtc);
|
|
|
|
armada_drm_crtc_update(dcrtc, false);
|
|
|
|
|
|
|
|
if (!crtc->state->active) {
|
|
|
|
/*
|
|
|
|
* This modeset will be leaving the CRTC disabled, so
|
|
|
|
* call the backend to disable upstream clocks etc.
|
|
|
|
*/
|
|
|
|
if (dcrtc->variant->disable)
|
|
|
|
dcrtc->variant->disable(dcrtc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We will not receive any further vblank events.
|
|
|
|
* Send the flip_done event manually.
|
|
|
|
*/
|
|
|
|
event = crtc->state->event;
|
|
|
|
crtc->state->event = NULL;
|
|
|
|
if (event) {
|
|
|
|
spin_lock_irq(&crtc->dev->event_lock);
|
|
|
|
drm_crtc_send_vblank_event(crtc, event);
|
|
|
|
spin_unlock_irq(&crtc->dev->event_lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armada_drm_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)
|
2018-07-30 11:52:34 +01:00
|
|
|
{
|
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_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
|
|
|
|
crtc);
|
2018-07-30 11:52:34 +01:00
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
|
|
|
|
|
|
|
if (!old_state->active) {
|
|
|
|
/*
|
|
|
|
* This modeset is enabling the CRTC after it having
|
|
|
|
* been disabled. Reverse the call to ->disable in
|
|
|
|
* the atomic_disable().
|
|
|
|
*/
|
|
|
|
if (dcrtc->variant->enable)
|
|
|
|
dcrtc->variant->enable(dcrtc, &crtc->state->adjusted_mode);
|
|
|
|
}
|
|
|
|
armada_drm_crtc_update(dcrtc, true);
|
|
|
|
drm_crtc_vblank_on(crtc);
|
|
|
|
|
2019-01-25 09:47:05 +00:00
|
|
|
if (crtc->state->adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
WARN_ON(drm_crtc_vblank_get(crtc));
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
armada_drm_crtc_queue_state_event(crtc);
|
|
|
|
}
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
static const struct drm_crtc_helper_funcs armada_crtc_helper_funcs = {
|
2018-07-14 11:17:45 +01:00
|
|
|
.mode_valid = armada_drm_crtc_mode_valid,
|
2012-08-15 13:59:49 +01:00
|
|
|
.mode_fixup = armada_drm_crtc_mode_fixup,
|
2018-07-30 11:52:34 +01:00
|
|
|
.mode_set_nofb = armada_drm_crtc_mode_set_nofb,
|
2018-07-01 15:46:26 +01:00
|
|
|
.atomic_check = armada_drm_crtc_atomic_check,
|
2018-07-30 11:52:34 +01:00
|
|
|
.atomic_begin = armada_drm_crtc_atomic_begin,
|
|
|
|
.atomic_flush = armada_drm_crtc_atomic_flush,
|
2018-07-30 11:52:34 +01:00
|
|
|
.atomic_disable = armada_drm_crtc_atomic_disable,
|
|
|
|
.atomic_enable = armada_drm_crtc_atomic_enable,
|
2012-08-15 13:59:49 +01:00
|
|
|
};
|
|
|
|
|
2013-05-19 10:55:17 +01:00
|
|
|
static void armada_load_cursor_argb(void __iomem *base, uint32_t *pix,
|
|
|
|
unsigned stride, unsigned width, unsigned height)
|
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
unsigned y;
|
|
|
|
|
|
|
|
addr = SRAM_HWC32_RAM1;
|
|
|
|
for (y = 0; y < height; y++) {
|
|
|
|
uint32_t *p = &pix[y * stride];
|
|
|
|
unsigned x;
|
|
|
|
|
|
|
|
for (x = 0; x < width; x++, p++) {
|
|
|
|
uint32_t val = *p;
|
|
|
|
|
2018-07-01 15:46:54 +01:00
|
|
|
/*
|
|
|
|
* In "ARGB888" (HWC32) mode, writing to the SRAM
|
|
|
|
* requires these bits to contain:
|
|
|
|
* 31:24 = alpha 23:16 = blue 15:8 = green 7:0 = red
|
|
|
|
* So, it's actually ABGR8888. This is independent
|
|
|
|
* of the SWAPRB bits in DMA control register 0.
|
|
|
|
*/
|
2013-05-19 10:55:17 +01:00
|
|
|
val = (val & 0xff00ff00) |
|
|
|
|
(val & 0x000000ff) << 16 |
|
|
|
|
(val & 0x00ff0000) >> 16;
|
|
|
|
|
|
|
|
writel_relaxed(val,
|
|
|
|
base + LCD_SPU_SRAM_WRDAT);
|
|
|
|
writel_relaxed(addr | SRAM_WRITE,
|
|
|
|
base + LCD_SPU_SRAM_CTRL);
|
2014-04-07 12:00:17 +01:00
|
|
|
readl_relaxed(base + LCD_SPU_HWC_OVSA_HPXL_VLN);
|
2013-05-19 10:55:17 +01:00
|
|
|
addr += 1;
|
|
|
|
if ((addr & 0x00ff) == 0)
|
|
|
|
addr += 0xf00;
|
|
|
|
if ((addr & 0x30ff) == 0)
|
|
|
|
addr = SRAM_HWC32_RAM2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armada_drm_crtc_cursor_tran(void __iomem *base)
|
|
|
|
{
|
|
|
|
unsigned addr;
|
|
|
|
|
|
|
|
for (addr = 0; addr < 256; addr++) {
|
|
|
|
/* write the default value */
|
|
|
|
writel_relaxed(0x55555555, base + LCD_SPU_SRAM_WRDAT);
|
|
|
|
writel_relaxed(addr | SRAM_WRITE | SRAM_HWC32_TRAN,
|
|
|
|
base + LCD_SPU_SRAM_CTRL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int armada_drm_crtc_cursor_update(struct armada_crtc *dcrtc, bool reload)
|
|
|
|
{
|
|
|
|
uint32_t xoff, xscr, w = dcrtc->cursor_w, s;
|
|
|
|
uint32_t yoff, yscr, h = dcrtc->cursor_h;
|
|
|
|
uint32_t para1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate the visible width and height of the cursor,
|
|
|
|
* screen position, and the position in the cursor bitmap.
|
|
|
|
*/
|
|
|
|
if (dcrtc->cursor_x < 0) {
|
|
|
|
xoff = -dcrtc->cursor_x;
|
|
|
|
xscr = 0;
|
|
|
|
w -= min(xoff, w);
|
|
|
|
} else if (dcrtc->cursor_x + w > dcrtc->crtc.mode.hdisplay) {
|
|
|
|
xoff = 0;
|
|
|
|
xscr = dcrtc->cursor_x;
|
|
|
|
w = max_t(int, dcrtc->crtc.mode.hdisplay - dcrtc->cursor_x, 0);
|
|
|
|
} else {
|
|
|
|
xoff = 0;
|
|
|
|
xscr = dcrtc->cursor_x;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dcrtc->cursor_y < 0) {
|
|
|
|
yoff = -dcrtc->cursor_y;
|
|
|
|
yscr = 0;
|
|
|
|
h -= min(yoff, h);
|
|
|
|
} else if (dcrtc->cursor_y + h > dcrtc->crtc.mode.vdisplay) {
|
|
|
|
yoff = 0;
|
|
|
|
yscr = dcrtc->cursor_y;
|
|
|
|
h = max_t(int, dcrtc->crtc.mode.vdisplay - dcrtc->cursor_y, 0);
|
|
|
|
} else {
|
|
|
|
yoff = 0;
|
|
|
|
yscr = dcrtc->cursor_y;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On interlaced modes, the vertical cursor size must be halved */
|
|
|
|
s = dcrtc->cursor_w;
|
|
|
|
if (dcrtc->interlaced) {
|
|
|
|
s *= 2;
|
|
|
|
yscr /= 2;
|
|
|
|
h /= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!dcrtc->cursor_obj || !h || !w) {
|
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
|
|
|
dcrtc->cursor_update = false;
|
|
|
|
armada_updatel(0, CFG_HWC_ENA, dcrtc->base + LCD_SPU_DMA_CTRL0);
|
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-08 10:22:15 +01:00
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
2013-05-19 10:55:17 +01:00
|
|
|
para1 = readl_relaxed(dcrtc->base + LCD_SPU_SRAM_PARA1);
|
|
|
|
armada_updatel(CFG_CSB_256x32, CFG_CSB_256x32 | CFG_PDWN256x32,
|
|
|
|
dcrtc->base + LCD_SPU_SRAM_PARA1);
|
2017-07-08 10:22:15 +01:00
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
2013-05-19 10:55:17 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the transparency if the SRAM was powered down.
|
|
|
|
* We must also reload the cursor data as well.
|
|
|
|
*/
|
|
|
|
if (!(para1 & CFG_CSB_256x32)) {
|
|
|
|
armada_drm_crtc_cursor_tran(dcrtc->base);
|
|
|
|
reload = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dcrtc->cursor_hw_sz != (h << 16 | w)) {
|
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
|
|
|
dcrtc->cursor_update = false;
|
|
|
|
armada_updatel(0, CFG_HWC_ENA, dcrtc->base + LCD_SPU_DMA_CTRL0);
|
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
|
|
|
reload = true;
|
|
|
|
}
|
|
|
|
if (reload) {
|
|
|
|
struct armada_gem_object *obj = dcrtc->cursor_obj;
|
|
|
|
uint32_t *pix;
|
|
|
|
/* Set the top-left corner of the cursor image */
|
|
|
|
pix = obj->addr;
|
|
|
|
pix += yoff * s + xoff;
|
|
|
|
armada_load_cursor_argb(dcrtc->base, pix, s, w, h);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reload the cursor position, size and enable in the IRQ handler */
|
|
|
|
spin_lock_irq(&dcrtc->irq_lock);
|
|
|
|
dcrtc->cursor_hw_pos = yscr << 16 | xscr;
|
|
|
|
dcrtc->cursor_hw_sz = h << 16 | w;
|
|
|
|
dcrtc->cursor_update = true;
|
|
|
|
armada_drm_crtc_enable_irq(dcrtc, DUMB_FRAMEDONE_ENA);
|
|
|
|
spin_unlock_irq(&dcrtc->irq_lock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cursor_update(void *data)
|
|
|
|
{
|
|
|
|
armada_drm_crtc_cursor_update(data, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
|
|
|
|
struct drm_file *file, uint32_t handle, uint32_t w, uint32_t h)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
struct armada_gem_object *obj = NULL;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* If no cursor support, replicate drm's return value */
|
2014-04-22 15:24:03 +01:00
|
|
|
if (!dcrtc->variant->has_spu_adv_reg)
|
2013-05-19 10:55:17 +01:00
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
if (handle && w > 0 && h > 0) {
|
|
|
|
/* maximum size is 64x32 or 32x64 */
|
|
|
|
if (w > 64 || h > 64 || (w > 32 && h > 32))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-05-09 11:04:54 +01:00
|
|
|
obj = armada_gem_object_lookup(file, handle);
|
2013-05-19 10:55:17 +01:00
|
|
|
if (!obj)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
/* Must be a kernel-mapped object */
|
|
|
|
if (!obj->addr) {
|
2020-05-15 10:50:56 +01:00
|
|
|
drm_gem_object_put(&obj->obj);
|
2013-05-19 10:55:17 +01:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (obj->obj.size < w * h * 4) {
|
|
|
|
DRM_ERROR("buffer is too small\n");
|
2020-05-15 10:50:56 +01:00
|
|
|
drm_gem_object_put(&obj->obj);
|
2013-05-19 10:55:17 +01:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dcrtc->cursor_obj) {
|
|
|
|
dcrtc->cursor_obj->update = NULL;
|
|
|
|
dcrtc->cursor_obj->update_data = NULL;
|
2020-05-15 10:50:56 +01:00
|
|
|
drm_gem_object_put(&dcrtc->cursor_obj->obj);
|
2013-05-19 10:55:17 +01:00
|
|
|
}
|
|
|
|
dcrtc->cursor_obj = obj;
|
|
|
|
dcrtc->cursor_w = w;
|
|
|
|
dcrtc->cursor_h = h;
|
|
|
|
ret = armada_drm_crtc_cursor_update(dcrtc, true);
|
|
|
|
if (obj) {
|
|
|
|
obj->update_data = dcrtc;
|
|
|
|
obj->update = cursor_update;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int armada_drm_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* If no cursor support, replicate drm's return value */
|
2014-04-22 15:24:03 +01:00
|
|
|
if (!dcrtc->variant->has_spu_adv_reg)
|
2013-05-19 10:55:17 +01:00
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
dcrtc->cursor_x = x;
|
|
|
|
dcrtc->cursor_y = y;
|
|
|
|
ret = armada_drm_crtc_cursor_update(dcrtc, false);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
static void armada_drm_crtc_destroy(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
2020-09-04 16:39:19 +02:00
|
|
|
struct armada_private *priv = drm_to_armada_dev(crtc->dev);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
2013-05-19 10:55:17 +01:00
|
|
|
if (dcrtc->cursor_obj)
|
2020-05-15 10:50:56 +01:00
|
|
|
drm_gem_object_put(&dcrtc->cursor_obj->obj);
|
2013-05-19 10:55:17 +01:00
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
priv->dcrtc[dcrtc->num] = NULL;
|
|
|
|
drm_crtc_cleanup(&dcrtc->crtc);
|
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
if (dcrtc->variant->disable)
|
|
|
|
dcrtc->variant->disable(dcrtc);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
2014-04-26 15:19:38 +01:00
|
|
|
writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ENA);
|
|
|
|
|
2014-06-15 11:21:23 +01:00
|
|
|
of_node_put(dcrtc->crtc.port);
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
kfree(dcrtc);
|
|
|
|
}
|
|
|
|
|
2018-07-07 16:53:39 +01:00
|
|
|
static int armada_drm_crtc_late_register(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
if (IS_ENABLED(CONFIG_DEBUG_FS))
|
|
|
|
armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-07 17:16:18 +08:00
|
|
|
/* These are called under the vbl_lock. */
|
|
|
|
static int armada_drm_crtc_enable_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
2018-06-26 17:06:06 +01:00
|
|
|
unsigned long flags;
|
2017-02-07 17:16:18 +08:00
|
|
|
|
2018-06-26 17:06:06 +01:00
|
|
|
spin_lock_irqsave(&dcrtc->irq_lock, flags);
|
2017-02-07 17:16:18 +08:00
|
|
|
armada_drm_crtc_enable_irq(dcrtc, VSYNC_IRQ_ENA);
|
2018-06-26 17:06:06 +01:00
|
|
|
spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
|
2017-02-07 17:16:18 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armada_drm_crtc_disable_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
|
2018-06-26 17:06:06 +01:00
|
|
|
unsigned long flags;
|
2017-02-07 17:16:18 +08:00
|
|
|
|
2018-06-26 17:06:06 +01:00
|
|
|
spin_lock_irqsave(&dcrtc->irq_lock, flags);
|
2017-02-07 17:16:18 +08:00
|
|
|
armada_drm_crtc_disable_irq(dcrtc, VSYNC_IRQ_ENA);
|
2018-06-26 17:06:06 +01:00
|
|
|
spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
|
2017-02-07 17:16:18 +08:00
|
|
|
}
|
|
|
|
|
2015-12-15 12:20:59 +01:00
|
|
|
static const struct drm_crtc_funcs armada_crtc_funcs = {
|
2018-07-30 11:52:34 +01:00
|
|
|
.reset = drm_atomic_helper_crtc_reset,
|
2013-05-19 10:55:17 +01:00
|
|
|
.cursor_set = armada_drm_crtc_cursor_set,
|
|
|
|
.cursor_move = armada_drm_crtc_cursor_move,
|
2012-08-15 13:59:49 +01:00
|
|
|
.destroy = armada_drm_crtc_destroy,
|
2018-07-30 11:53:06 +01:00
|
|
|
.set_config = drm_atomic_helper_set_config,
|
2018-07-30 11:53:06 +01:00
|
|
|
.page_flip = drm_atomic_helper_page_flip,
|
2018-07-30 11:52:34 +01:00
|
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
2018-07-07 16:53:39 +01:00
|
|
|
.late_register = armada_drm_crtc_late_register,
|
2017-02-07 17:16:18 +08:00
|
|
|
.enable_vblank = armada_drm_crtc_enable_vblank,
|
|
|
|
.disable_vblank = armada_drm_crtc_disable_vblank,
|
2012-08-15 13:59:49 +01:00
|
|
|
};
|
|
|
|
|
2018-07-14 11:15:35 +01:00
|
|
|
int armada_crtc_select_clock(struct armada_crtc *dcrtc,
|
|
|
|
struct armada_clk_result *res,
|
|
|
|
const struct armada_clocking_params *params,
|
|
|
|
struct clk *clks[], size_t num_clks,
|
|
|
|
unsigned long desired_khz)
|
|
|
|
{
|
|
|
|
unsigned long desired_hz = desired_khz * 1000;
|
|
|
|
unsigned long desired_clk_hz; // requested clk input
|
|
|
|
unsigned long real_clk_hz; // actual clk input
|
|
|
|
unsigned long real_hz; // actual pixel clk
|
|
|
|
unsigned long permillage;
|
|
|
|
struct clk *clk;
|
|
|
|
u32 div;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%u:%s] desired clock=%luHz\n",
|
|
|
|
dcrtc->crtc.base.id, dcrtc->crtc.name, desired_hz);
|
|
|
|
|
|
|
|
for (i = 0; i < num_clks; i++) {
|
|
|
|
clk = clks[i];
|
|
|
|
if (!clk)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (params->settable & BIT(i)) {
|
|
|
|
real_clk_hz = clk_round_rate(clk, desired_hz);
|
|
|
|
desired_clk_hz = desired_hz;
|
|
|
|
} else {
|
|
|
|
real_clk_hz = clk_get_rate(clk);
|
|
|
|
desired_clk_hz = real_clk_hz;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the clock can do exactly the desired rate, we're done */
|
|
|
|
if (real_clk_hz == desired_hz) {
|
|
|
|
real_hz = real_clk_hz;
|
|
|
|
div = 1;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate the divider - if invalid, we can't do this rate */
|
|
|
|
div = DIV_ROUND_CLOSEST(real_clk_hz, desired_hz);
|
|
|
|
if (div == 0 || div > params->div_max)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Calculate the actual rate - HDMI requires -0.6%..+0.5% */
|
|
|
|
real_hz = DIV_ROUND_CLOSEST(real_clk_hz, div);
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%u:%s] clk=%u %luHz div=%u real=%luHz\n",
|
|
|
|
dcrtc->crtc.base.id, dcrtc->crtc.name,
|
|
|
|
i, real_clk_hz, div, real_hz);
|
|
|
|
|
|
|
|
/* Avoid repeated division */
|
|
|
|
if (real_hz < desired_hz) {
|
|
|
|
permillage = real_hz / desired_khz;
|
|
|
|
if (permillage < params->permillage_min)
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
permillage = DIV_ROUND_UP(real_hz, desired_khz);
|
|
|
|
if (permillage > params->permillage_max)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -ERANGE;
|
|
|
|
|
|
|
|
found:
|
|
|
|
DRM_DEBUG_KMS("[CRTC:%u:%s] selected clk=%u %luHz div=%u real=%luHz\n",
|
|
|
|
dcrtc->crtc.base.id, dcrtc->crtc.name,
|
|
|
|
i, real_clk_hz, div, real_hz);
|
|
|
|
|
|
|
|
res->desired_clk_hz = desired_clk_hz;
|
|
|
|
res->clk = clk;
|
|
|
|
res->div = div;
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2015-06-06 21:46:53 +01:00
|
|
|
static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
|
2014-06-15 11:21:23 +01:00
|
|
|
struct resource *res, int irq, const struct armada_variant *variant,
|
|
|
|
struct device_node *port)
|
2012-08-15 13:59:49 +01:00
|
|
|
{
|
2020-09-04 16:39:19 +02:00
|
|
|
struct armada_private *priv = drm_to_armada_dev(drm);
|
2012-08-15 13:59:49 +01:00
|
|
|
struct armada_crtc *dcrtc;
|
2018-07-30 11:53:06 +01:00
|
|
|
struct drm_plane *primary;
|
2012-08-15 13:59:49 +01:00
|
|
|
void __iomem *base;
|
|
|
|
int ret;
|
|
|
|
|
2014-08-07 17:36:12 -07:00
|
|
|
base = devm_ioremap_resource(dev, res);
|
2014-06-11 14:00:05 +09:00
|
|
|
if (IS_ERR(base))
|
|
|
|
return PTR_ERR(base);
|
2012-08-15 13:59:49 +01:00
|
|
|
|
|
|
|
dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
|
|
|
|
if (!dcrtc) {
|
|
|
|
DRM_ERROR("failed to allocate Armada crtc\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2014-04-22 11:10:15 +01:00
|
|
|
if (dev != drm->dev)
|
|
|
|
dev_set_drvdata(dev, dcrtc);
|
|
|
|
|
2014-04-22 15:24:03 +01:00
|
|
|
dcrtc->variant = variant;
|
2012-08-15 13:59:49 +01:00
|
|
|
dcrtc->base = base;
|
2014-04-22 11:10:15 +01:00
|
|
|
dcrtc->num = drm->mode_config.num_crtc;
|
2012-08-15 13:59:49 +01:00
|
|
|
dcrtc->cfg_dumb_ctrl = DUMB24_RGB888_0;
|
|
|
|
dcrtc->spu_iopad_ctrl = CFG_VSCALE_LN_EN | CFG_IOPAD_DUMB24;
|
|
|
|
spin_lock_init(&dcrtc->irq_lock);
|
|
|
|
dcrtc->irq_ena = CLEAN_SPU_IRQ_ISR;
|
|
|
|
|
|
|
|
/* Initialize some registers which we don't otherwise set */
|
|
|
|
writel_relaxed(0x00000001, dcrtc->base + LCD_CFG_SCLK_DIV);
|
|
|
|
writel_relaxed(0x00000000, dcrtc->base + LCD_SPU_BLANKCOLOR);
|
|
|
|
writel_relaxed(dcrtc->spu_iopad_ctrl,
|
|
|
|
dcrtc->base + LCD_SPU_IOPAD_CONTROL);
|
|
|
|
writel_relaxed(0x00000000, dcrtc->base + LCD_SPU_SRAM_PARA0);
|
|
|
|
writel_relaxed(CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 |
|
|
|
|
CFG_PDWN32x32 | CFG_PDWN16x66 | CFG_PDWN32x66 |
|
|
|
|
CFG_PDWN64x66, dcrtc->base + LCD_SPU_SRAM_PARA1);
|
|
|
|
writel_relaxed(0x2032ff81, dcrtc->base + LCD_SPU_DMA_CTRL1);
|
2014-04-26 15:19:38 +01:00
|
|
|
writel_relaxed(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA);
|
2018-06-26 17:06:06 +01:00
|
|
|
readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
|
2014-04-26 15:19:38 +01:00
|
|
|
writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
|
|
|
|
|
|
|
|
ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",
|
|
|
|
dcrtc);
|
2017-12-08 12:16:22 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto err_crtc;
|
2012-08-15 13:59:49 +01:00
|
|
|
|
2014-04-22 15:24:03 +01:00
|
|
|
if (dcrtc->variant->init) {
|
2014-04-22 11:10:15 +01:00
|
|
|
ret = dcrtc->variant->init(dcrtc, dev);
|
2017-12-08 12:16:22 +00:00
|
|
|
if (ret)
|
|
|
|
goto err_crtc;
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure AXI pipeline is enabled */
|
|
|
|
armada_updatel(CFG_ARBFAST_ENA, 0, dcrtc->base + LCD_SPU_DMA_CTRL0);
|
|
|
|
|
|
|
|
priv->dcrtc[dcrtc->num] = dcrtc;
|
|
|
|
|
2014-06-15 11:21:23 +01:00
|
|
|
dcrtc->crtc.port = port;
|
2015-07-15 18:11:24 +01:00
|
|
|
|
2015-07-15 18:11:24 +01:00
|
|
|
primary = kzalloc(sizeof(*primary), GFP_KERNEL);
|
2017-12-08 12:16:22 +00:00
|
|
|
if (!primary) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto err_crtc;
|
|
|
|
}
|
2015-07-15 18:11:24 +01:00
|
|
|
|
2018-07-30 11:52:34 +01:00
|
|
|
ret = armada_drm_primary_plane_init(drm, primary);
|
2015-07-15 18:11:24 +01:00
|
|
|
if (ret) {
|
|
|
|
kfree(primary);
|
2017-12-08 12:16:22 +00:00
|
|
|
goto err_crtc;
|
2015-07-15 18:11:24 +01:00
|
|
|
}
|
|
|
|
|
2018-07-30 11:53:06 +01:00
|
|
|
ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, primary, NULL,
|
drm: Pass 'name' to drm_crtc_init_with_planes()
Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.
I didn't convert drm_crtc_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.
@@
identifier dev, crtc, primary, cursor, funcs;
@@
int drm_crtc_init_with_planes(struct drm_device *dev,
struct drm_crtc *crtc,
struct drm_plane *primary, struct drm_plane *cursor,
const struct drm_crtc_funcs *funcs
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, crtc, primary, cursor, funcs;
@@
int drm_crtc_init_with_planes(struct drm_device *dev,
struct drm_crtc *crtc,
struct drm_plane *primary, struct drm_plane *cursor,
const struct drm_crtc_funcs *funcs
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4, E5;
@@
drm_crtc_init_with_planes(E1, E2, E3, E4, E5
+ ,NULL
)
v2: Split crtc and plane changes apart
Pass NULL for no-name instead of ""
Leave drm_crtc_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670771-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-12-09 16:19:31 +02:00
|
|
|
&armada_crtc_funcs, NULL);
|
2015-07-15 18:11:24 +01:00
|
|
|
if (ret)
|
|
|
|
goto err_crtc_init;
|
|
|
|
|
2012-08-15 13:59:49 +01:00
|
|
|
drm_crtc_helper_add(&dcrtc->crtc, &armada_crtc_helper_funcs);
|
|
|
|
|
2018-07-01 15:46:26 +01:00
|
|
|
ret = drm_mode_crtc_set_gamma_size(&dcrtc->crtc, 256);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
drm_crtc_enable_color_mgmt(&dcrtc->crtc, 0, false, 256);
|
|
|
|
|
2014-04-22 11:10:15 +01:00
|
|
|
return armada_overlay_plane_create(drm, 1 << dcrtc->num);
|
2015-07-15 18:11:24 +01:00
|
|
|
|
|
|
|
err_crtc_init:
|
2018-07-30 11:53:06 +01:00
|
|
|
primary->funcs->destroy(primary);
|
2017-12-08 12:16:22 +00:00
|
|
|
err_crtc:
|
|
|
|
kfree(dcrtc);
|
|
|
|
|
2015-07-15 18:11:24 +01:00
|
|
|
return ret;
|
2014-04-22 11:10:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
armada_lcd_bind(struct device *dev, struct device *master, void *data)
|
|
|
|
{
|
|
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
|
|
struct drm_device *drm = data;
|
|
|
|
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
|
int irq = platform_get_irq(pdev, 0);
|
|
|
|
const struct armada_variant *variant;
|
2014-06-15 11:21:23 +01:00
|
|
|
struct device_node *port = NULL;
|
2014-04-22 11:10:15 +01:00
|
|
|
|
|
|
|
if (irq < 0)
|
|
|
|
return irq;
|
|
|
|
|
|
|
|
if (!dev->of_node) {
|
|
|
|
const struct platform_device_id *id;
|
|
|
|
|
|
|
|
id = platform_get_device_id(pdev);
|
|
|
|
if (!id)
|
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
variant = (const struct armada_variant *)id->driver_data;
|
|
|
|
} else {
|
|
|
|
const struct of_device_id *match;
|
2014-06-15 11:21:23 +01:00
|
|
|
struct device_node *np, *parent = dev->of_node;
|
2014-04-22 11:10:15 +01:00
|
|
|
|
|
|
|
match = of_match_device(dev->driver->of_match_table, dev);
|
|
|
|
if (!match)
|
|
|
|
return -ENXIO;
|
|
|
|
|
2014-06-15 11:21:23 +01:00
|
|
|
np = of_get_child_by_name(parent, "ports");
|
|
|
|
if (np)
|
|
|
|
parent = np;
|
|
|
|
port = of_get_child_by_name(parent, "port");
|
|
|
|
of_node_put(np);
|
|
|
|
if (!port) {
|
2017-07-18 16:43:04 -05:00
|
|
|
dev_err(dev, "no port node found in %pOF\n", parent);
|
2014-06-15 11:21:23 +01:00
|
|
|
return -ENXIO;
|
|
|
|
}
|
|
|
|
|
2014-04-22 11:10:15 +01:00
|
|
|
variant = match->data;
|
|
|
|
}
|
|
|
|
|
2014-06-15 11:21:23 +01:00
|
|
|
return armada_drm_crtc_create(drm, dev, res, irq, variant, port);
|
2014-04-22 11:10:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
armada_lcd_unbind(struct device *dev, struct device *master, void *data)
|
|
|
|
{
|
|
|
|
struct armada_crtc *dcrtc = dev_get_drvdata(dev);
|
|
|
|
|
|
|
|
armada_drm_crtc_destroy(&dcrtc->crtc);
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
2014-04-22 11:10:15 +01:00
|
|
|
|
|
|
|
static const struct component_ops armada_lcd_ops = {
|
|
|
|
.bind = armada_lcd_bind,
|
|
|
|
.unbind = armada_lcd_unbind,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int armada_lcd_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
return component_add(&pdev->dev, &armada_lcd_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int armada_lcd_remove(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
component_del(&pdev->dev, &armada_lcd_ops);
|
|
|
|
return 0;
|
2012-08-15 13:59:49 +01:00
|
|
|
}
|
2014-04-22 11:10:15 +01:00
|
|
|
|
2017-06-20 10:44:33 +05:30
|
|
|
static const struct of_device_id armada_lcd_of_match[] = {
|
2014-04-22 11:10:15 +01:00
|
|
|
{
|
|
|
|
.compatible = "marvell,dove-lcd",
|
|
|
|
.data = &armada510_ops,
|
|
|
|
},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, armada_lcd_of_match);
|
|
|
|
|
|
|
|
static const struct platform_device_id armada_lcd_platform_ids[] = {
|
|
|
|
{
|
|
|
|
.name = "armada-lcd",
|
|
|
|
.driver_data = (unsigned long)&armada510_ops,
|
|
|
|
}, {
|
|
|
|
.name = "armada-510-lcd",
|
|
|
|
.driver_data = (unsigned long)&armada510_ops,
|
|
|
|
},
|
|
|
|
{ },
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(platform, armada_lcd_platform_ids);
|
|
|
|
|
|
|
|
struct platform_driver armada_lcd_platform_driver = {
|
|
|
|
.probe = armada_lcd_probe,
|
|
|
|
.remove = armada_lcd_remove,
|
|
|
|
.driver = {
|
|
|
|
.name = "armada-lcd",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.of_match_table = armada_lcd_of_match,
|
|
|
|
},
|
|
|
|
.id_table = armada_lcd_platform_ids,
|
|
|
|
};
|