leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpu/drm: ingenic: Check for display size in CRTC atomic check

Browse Source 
Check that the requested display size isn't above the limits supported
by the CRTC.

- JZ4750 and older support up to 800x600;
- JZ4755 supports up to 1024x576;
- JZ4760 and JZ4770 support up to 720p;
- JZ4780 supports up to 2k.

v2: No change

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210144142.33143-5-paul@crapouillou.net
# *** extracted tags ***
Acked-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Paul Cercueil 2019-12-10 15:41:41 +01:00
parent 96ea0ae692
commit a7c909b7c0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/ingenic/ingenic-drm.c
View File

@ -153,6 +153,7 @@ struct ingenic_dma_hwdesc {
struct jz_soc_info { struct jz_soc_info {
bool needs_dev_clk; bool needs_dev_clk;
unsigned int max_width, max_height;
}; };
struct ingenic_drm { struct ingenic_drm {
@ -164,6 +165,7 @@ struct ingenic_drm {
struct device *dev; struct device *dev;
struct regmap *map; struct regmap *map;
struct clk *lcd_clk, *pix_clk; struct clk *lcd_clk, *pix_clk;
const struct jz_soc_info *soc_info;
struct ingenic_dma_hwdesc *dma_hwdesc; struct ingenic_dma_hwdesc *dma_hwdesc;
dma_addr_t dma_hwdesc_phys; dma_addr_t dma_hwdesc_phys;
@ -326,6 +328,10 @@ static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc,
if (!drm_atomic_crtc_needs_modeset(state)) if (!drm_atomic_crtc_needs_modeset(state))
return 0; return 0;
if (state->mode.hdisplay > priv->soc_info->max_height ||
state->mode.vdisplay > priv->soc_info->max_width)
return -EINVAL;
rate = clk_round_rate(priv->pix_clk, rate = clk_round_rate(priv->pix_clk,
state->adjusted_mode.clock * 1000); state->adjusted_mode.clock * 1000);
if (rate < 0) if (rate < 0)
@ -621,6 +627,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->soc_info = soc_info;
priv->dev = dev; priv->dev = dev;
drm = &priv->drm; drm = &priv->drm;
drm->dev_private = priv; drm->dev_private = priv;
@ -636,7 +643,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
drm_mode_config_init(drm); drm_mode_config_init(drm);
drm->mode_config.min_width = 0; drm->mode_config.min_width = 0;
drm->mode_config.min_height = 0; drm->mode_config.min_height = 0;
drm->mode_config.max_width = 800; drm->mode_config.max_width = soc_info->max_width;
drm->mode_config.max_height = 4095; drm->mode_config.max_height = 4095;
drm->mode_config.funcs = &ingenic_drm_mode_config_funcs; drm->mode_config.funcs = &ingenic_drm_mode_config_funcs;
@ -814,10 +821,14 @@ static int ingenic_drm_remove(struct platform_device *pdev)
static const struct jz_soc_info jz4740_soc_info = { static const struct jz_soc_info jz4740_soc_info = {
.needs_dev_clk = true, .needs_dev_clk = true,
.max_width = 800,
.max_height = 600,
}; };
static const struct jz_soc_info jz4725b_soc_info = { static const struct jz_soc_info jz4725b_soc_info = {
.needs_dev_clk = false, .needs_dev_clk = false,
.max_width = 800,
.max_height = 600,
}; };
static const struct of_device_id ingenic_drm_of_match[] = { static const struct of_device_id ingenic_drm_of_match[] = {