github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/sun4i: Nuke mixer pointer from layer code

Browse Source 
It's not used anymore, so remove it. This allows trully independent
layer state from mixer.

Reviewed-by: Chen-Yu Tsai <wens@kernel.org>
Tested-by: Ryan Walklin <ryan@testtoast.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20251104180942.61538-31-jernej.skrabec@gmail.com
Signed-off-by: Chen-Yu Tsai <wens@kernel.org>
This commit is contained in:
Jernej Skrabec 2025-11-04 19:09:42 +01:00 committed by Chen-Yu Tsai
parent 345bca734c
commit 54c33a4fcf
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/sun4i/sun8i_mixer.c
View File

@ -269,7 +269,7 @@ static void sun8i_mixer_commit(struct sunxi_engine *engine,
int w, h, x, y, zpos;
bool enable;
if (!(plane->possible_crtcs & drm_crtc_mask(crtc)) || layer->mixer != mixer)
if (!(plane->possible_crtcs & drm_crtc_mask(crtc)))
continue;
plane_state = drm_atomic_get_new_plane_state(state, plane);
@ -337,9 +337,8 @@ static struct drm_plane **sun8i_layers_init(struct drm_device *drm,
if (mixer->cfg->de_type == SUN8I_MIXER_DE33)
phy_index = mixer->cfg->map[i];
layer = sun8i_vi_layer_init_one(drm, mixer, type,
mixer->engine.regs, i,
phy_index, plane_cnt,
layer = sun8i_vi_layer_init_one(drm, type, mixer->engine.regs,
i, phy_index, plane_cnt,
&mixer->cfg->lay_cfg);
if (IS_ERR(layer)) {
dev_err(drm->dev,
@ -363,9 +362,8 @@ static struct drm_plane **sun8i_layers_init(struct drm_device *drm,
if (mixer->cfg->de_type == SUN8I_MIXER_DE33)
phy_index = mixer->cfg->map[index];
layer = sun8i_ui_layer_init_one(drm, mixer, type,
mixer->engine.regs, index,
phy_index, plane_cnt,
layer = sun8i_ui_layer_init_one(drm, type, mixer->engine.regs,
index, phy_index, plane_cnt,
&mixer->cfg->lay_cfg);
if (IS_ERR(layer)) {
dev_err(drm->dev, "Couldn't initialize %s plane\n",

1
drivers/gpu/drm/sun4i/sun8i_mixer.h
View File

@ -226,7 +226,6 @@ enum {
struct sun8i_layer {
struct drm_plane plane;
struct sun8i_mixer *mixer;
int type;
int index;
int channel;

2
drivers/gpu/drm/sun4i/sun8i_ui_layer.c
View File

@ -258,7 +258,6 @@ static const uint64_t sun8i_layer_modifiers[] = {
};
struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
struct sun8i_mixer *mixer,
enum drm_plane_type type,
struct regmap *regs,
int index, int phy_index,
@ -272,7 +271,6 @@ struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
if (!layer)
return ERR_PTR(-ENOMEM);
layer->mixer = mixer;
layer->type = SUN8I_LAYER_TYPE_UI;
layer->index = index;
layer->channel = phy_index;

1
drivers/gpu/drm/sun4i/sun8i_ui_layer.h
View File

@ -50,7 +50,6 @@ struct sun8i_mixer;
struct sun8i_layer;
struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
struct sun8i_mixer *mixer,
enum drm_plane_type type,
struct regmap *regs,
int index, int phy_index,

2
drivers/gpu/drm/sun4i/sun8i_vi_layer.c
View File

@ -409,7 +409,6 @@ static const uint64_t sun8i_layer_modifiers[] = {
};
struct sun8i_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
struct sun8i_mixer *mixer,
enum drm_plane_type type,
struct regmap *regs,
int index, int phy_index,
@ -426,7 +425,6 @@ struct sun8i_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
if (!layer)
return ERR_PTR(-ENOMEM);
layer->mixer = mixer;
layer->type = SUN8I_LAYER_TYPE_VI;
layer->index = index;
layer->channel = phy_index;

1
drivers/gpu/drm/sun4i/sun8i_vi_layer.h
View File

@ -55,7 +55,6 @@ struct sun8i_mixer;
struct sun8i_layer;
struct sun8i_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
struct sun8i_mixer *mixer,
enum drm_plane_type type,
struct regmap *regs,
int index, int phy_index,