Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae2a3866 authored by Boris Brezillon's avatar Boris Brezillon Committed by android-build-merger
Browse files

drm/vc4: Fix ->clock_select setting for the VEC encoder 

am: 8ca7ef0d

Change-Id: I11e94c3a1ac3610088136cbad677e087403d0ca1
parents 0d20f9b5 8ca7ef0d

drivers/gpu/drm/vc4/vc4_crtc.c

+23 −15
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ struct vc4_crtc_data { 
	/* Which channel of the HVS this pixelvalve sources from. */

	int hvs_channel;



	enum vc4_encoder_type encoder0_type;

	enum vc4_encoder_type encoder1_type;

	enum vc4_encoder_type encoder_types[4];

};



#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset))
@@ -867,20 +866,26 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { 


static const struct vc4_crtc_data pv0_data = {

	.hvs_channel = 0,

	.encoder0_type = VC4_ENCODER_TYPE_DSI0,

	.encoder1_type = VC4_ENCODER_TYPE_DPI,

	.encoder_types = {

		[PV_CONTROL_CLK_SELECT_DSI] = VC4_ENCODER_TYPE_DSI0,

		[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_DPI,

	},

};



static const struct vc4_crtc_data pv1_data = {

	.hvs_channel = 2,

	.encoder0_type = VC4_ENCODER_TYPE_DSI1,

	.encoder1_type = VC4_ENCODER_TYPE_SMI,

	.encoder_types = {

		[PV_CONTROL_CLK_SELECT_DSI] = VC4_ENCODER_TYPE_DSI1,

		[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_SMI,

	},

};



static const struct vc4_crtc_data pv2_data = {

	.hvs_channel = 1,

	.encoder0_type = VC4_ENCODER_TYPE_VEC,

	.encoder1_type = VC4_ENCODER_TYPE_HDMI,

	.encoder_types = {

		[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,

		[PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,

	},

};



static const struct of_device_id vc4_crtc_dt_match[] = {
@@ -894,17 +899,20 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, 
					struct drm_crtc *crtc)

{

	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);

	const struct vc4_crtc_data *crtc_data = vc4_crtc->data;

	const enum vc4_encoder_type *encoder_types = crtc_data->encoder_types;

	struct drm_encoder *encoder;



	drm_for_each_encoder(encoder, drm) {

		struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);

		int i;



		if (vc4_encoder->type == vc4_crtc->data->encoder0_type) {

			vc4_encoder->clock_select = 0;

			encoder->possible_crtcs |= drm_crtc_mask(crtc);

		} else if (vc4_encoder->type == vc4_crtc->data->encoder1_type) {

			vc4_encoder->clock_select = 1;

		for (i = 0; i < ARRAY_SIZE(crtc_data->encoder_types); i++) {

			if (vc4_encoder->type == encoder_types[i]) {

				vc4_encoder->clock_select = i;

				encoder->possible_crtcs |= drm_crtc_mask(crtc);

				break;

			}

		}

	}

}

drivers/gpu/drm/vc4/vc4_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ to_vc4_plane(struct drm_plane *plane) 
}



enum vc4_encoder_type {

	VC4_ENCODER_TYPE_NONE,

	VC4_ENCODER_TYPE_HDMI,

	VC4_ENCODER_TYPE_VEC,

	VC4_ENCODER_TYPE_DSI0,

drivers/gpu/drm/vc4/vc4_regs.h

+2 −1
Original line number Diff line number Diff line
@@ -177,8 +177,9 @@ 
# define PV_CONTROL_WAIT_HSTART			BIT(12)

# define PV_CONTROL_PIXEL_REP_MASK		VC4_MASK(5, 4)

# define PV_CONTROL_PIXEL_REP_SHIFT		4

# define PV_CONTROL_CLK_SELECT_DSI_VEC		0

# define PV_CONTROL_CLK_SELECT_DSI		0

# define PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI	1

# define PV_CONTROL_CLK_SELECT_VEC		2

# define PV_CONTROL_CLK_SELECT_MASK		VC4_MASK(3, 2)

# define PV_CONTROL_CLK_SELECT_SHIFT		2

# define PV_CONTROL_FIFO_CLR			BIT(1)