Commit 54c33a4f authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Chen-Yu Tsai
Browse files

drm/sun4i: Nuke mixer pointer from layer code 



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

Reviewed-by: default avatarChen-Yu Tsai <wens@kernel.org>
Tested-by: default avatarRyan Walklin <ryan@testtoast.com>
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20251104180942.61538-31-jernej.skrabec@gmail.com


Signed-off-by: default avatarChen-Yu Tsai <wens@kernel.org>
parent 345bca73

drivers/gpu/drm/sun4i/sun8i_mixer.c

+5 −7
Original line number Diff line number Diff line
@@ -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",

drivers/gpu/drm/sun4i/sun8i_mixer.h

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ enum { 


struct sun8i_layer {

	struct drm_plane		plane;

	struct sun8i_mixer		*mixer;

	int				type;

	int				index;

	int				channel;

drivers/gpu/drm/sun4i/sun8i_ui_layer.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/sun4i/sun8i_ui_layer.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/sun4i/sun8i_vi_layer.c

+0 −2
Original line number Diff line number Diff line
@@ -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;