Skip to content

Commit 345bca7

Browse files
jernejskwens
authored andcommitted
drm/sun4i: vi_scaler: Find mixer from crtc
With "floating" planes in DE33, mixer can't be stored in layer structure anymore. Find mixer using currently bound crtc. 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-30-jernej.skrabec@gmail.com Signed-off-by: Chen-Yu Tsai <wens@kernel.org>
1 parent bb1d2dd commit 345bca7

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/gpu/drm/sun4i/sun8i_vi_layer.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <drm/drm_print.h>
1515
#include <drm/drm_probe_helper.h>
1616

17+
#include "sun4i_crtc.h"
1718
#include "sun8i_csc.h"
1819
#include "sun8i_mixer.h"
1920
#include "sun8i_vi_layer.h"
@@ -63,8 +64,9 @@ static void sun8i_vi_layer_update_coord(struct sun8i_layer *layer,
6364
struct drm_plane *plane)
6465
{
6566
struct drm_plane_state *state = plane->state;
67+
struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(state->crtc);
68+
struct sun8i_mixer *mixer = engine_to_sun8i_mixer(scrtc->engine);
6669
const struct drm_format_info *format = state->fb->format;
67-
struct sun8i_mixer *mixer = layer->mixer;
6870
u32 src_w, src_h, dst_w, dst_h;
6971
u32 outsize, insize;
7072
u32 hphase, vphase;

0 commit comments

Comments
 (0)