drm/msm/dpu: move writeback's atomic_check to dpu_writeback.c (71174f36) · Commits · git / linux-net

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c

+0 −54

Original line number	Diff line number	Diff line
		@@ -354,59 +354,6 @@ static void dpu_encoder_helper_phys_setup_cdm(struct dpu_encoder_phys *phys_enc)
		}
		}

		/**
		* dpu_encoder_phys_wb_atomic_check - verify and fixup given atomic states
		* @phys_enc: Pointer to physical encoder
		* @crtc_state: Pointer to CRTC atomic state
		* @conn_state: Pointer to connector atomic state
		*/
		static int dpu_encoder_phys_wb_atomic_check(
		struct dpu_encoder_phys *phys_enc,
		struct drm_crtc_state *crtc_state,
		struct drm_connector_state *conn_state)
		{
		struct drm_framebuffer *fb;
		const struct drm_display_mode *mode = &crtc_state->mode;

		DPU_DEBUG("[atomic_check:%d, \"%s\",%d,%d]\n",
		phys_enc->hw_wb->idx, mode->name, mode->hdisplay, mode->vdisplay);

		if (!conn_state \|\| !conn_state->connector) {
		DPU_ERROR("invalid connector state\n");
		return -EINVAL;
		} else if (conn_state->connector->status !=
		connector_status_connected) {
		DPU_ERROR("connector not connected %d\n",
		conn_state->connector->status);
		return -EINVAL;
		}

		if (!conn_state->writeback_job \|\| !conn_state->writeback_job->fb)
		return 0;

		fb = conn_state->writeback_job->fb;

		DPU_DEBUG("[fb_id:%u][fb:%u,%u]\n", fb->base.id,
		fb->width, fb->height);

		if (fb->width != mode->hdisplay) {
		DPU_ERROR("invalid fb w=%d, mode w=%d\n", fb->width,
		mode->hdisplay);
		return -EINVAL;
		} else if (fb->height != mode->vdisplay) {
		DPU_ERROR("invalid fb h=%d, mode h=%d\n", fb->height,
		mode->vdisplay);
		return -EINVAL;
		} else if (fb->width > phys_enc->hw_wb->caps->maxlinewidth) {
		DPU_ERROR("invalid fb w=%d, maxlinewidth=%u\n",
		fb->width, phys_enc->hw_wb->caps->maxlinewidth);
		return -EINVAL;
		}

		return drm_atomic_helper_check_wb_connector_state(conn_state->connector, conn_state->state);
		}


		/**
		* _dpu_encoder_phys_wb_update_flush - flush hardware update
		* @phys_enc: Pointer to physical encoder
		@@ -777,7 +724,6 @@ static void dpu_encoder_phys_wb_init_ops(struct dpu_encoder_phys_ops *ops)
		ops->is_master = dpu_encoder_phys_wb_is_master;
		ops->enable = dpu_encoder_phys_wb_enable;
		ops->disable = dpu_encoder_phys_wb_disable;
		ops->atomic_check = dpu_encoder_phys_wb_atomic_check;
		ops->wait_for_commit_done = dpu_encoder_phys_wb_wait_for_commit_done;
		ops->prepare_for_kickoff = dpu_encoder_phys_wb_prepare_for_kickoff;
		ops->handle_post_kickoff = dpu_encoder_phys_wb_handle_post_kickoff;

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -630,23 +630,26 @@ static int _dpu_kms_initialize_writeback(struct drm_device *dev,
		{
		struct drm_encoder *encoder = NULL;
		struct msm_display_info info;
		const enum dpu_wb wb_idx = WB_2;
		u32 maxlinewidth;
		int rc;

		memset(&info, 0, sizeof(info));

		info.num_of_h_tiles = 1;
		/* use only WB idx 2 instance for DPU */
		info.h_tile_instance[0] = WB_2;
		info.h_tile_instance[0] = wb_idx;
		info.intf_type = INTF_WB;

		maxlinewidth = dpu_rm_get_wb(&dpu_kms->rm, info.h_tile_instance[0])->caps->maxlinewidth;

		encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_VIRTUAL, &info);
		if (IS_ERR(encoder)) {
		DPU_ERROR("encoder init failed for dsi display\n");
		return PTR_ERR(encoder);
		}

		rc = dpu_writeback_init(dev, encoder, wb_formats,
		n_formats);
		rc = dpu_writeback_init(dev, encoder, wb_formats, n_formats, maxlinewidth);
		if (rc) {
		DPU_ERROR("dpu_writeback_init, rc = %d\n", rc);
		return rc;

drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c

+60 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		*/

		#include <drm/drm_edid.h>
		#include <drm/drm_framebuffer.h>

		#include "dpu_writeback.h"

		@@ -24,6 +25,61 @@ static int dpu_wb_conn_get_modes(struct drm_connector *connector)
		dev->mode_config.max_height);
		}

		static int dpu_wb_conn_atomic_check(struct drm_connector *connector,
		struct drm_atomic_state *state)
		{
		struct drm_writeback_connector *wb_conn = drm_connector_to_writeback(connector);
		struct dpu_wb_connector *dpu_wb_conn = to_dpu_wb_conn(wb_conn);
		struct drm_connector_state *conn_state =
		drm_atomic_get_new_connector_state(state, connector);
		struct drm_crtc *crtc;
		struct drm_crtc_state *crtc_state;
		const struct drm_display_mode *mode;
		struct drm_framebuffer *fb;

		DPU_DEBUG("[atomic_check:%d]\n", connector->base.id);

		if (!conn_state \|\| !conn_state->connector) {
		DPU_ERROR("invalid connector state\n");
		return -EINVAL;
		} else if (conn_state->connector->status != connector_status_connected) {
		DPU_ERROR("connector not connected %d\n", conn_state->connector->status);
		return -EINVAL;
		}

		crtc = conn_state->crtc;
		if (!crtc)
		return 0;

		if (!conn_state->writeback_job \|\| !conn_state->writeback_job->fb)
		return 0;

		crtc_state = drm_atomic_get_crtc_state(state, crtc);
		if (IS_ERR(crtc_state))
		return PTR_ERR(crtc_state);

		mode = &crtc_state->mode;

		fb = conn_state->writeback_job->fb;

		DPU_DEBUG("[fb_id:%u][fb:%u,%u][mode:\"%s\":%ux%u]\n", fb->base.id, fb->width, fb->height,
		mode->name, mode->hdisplay, mode->vdisplay);

		if (fb->width != mode->hdisplay) {
		DPU_ERROR("invalid fb w=%d, mode w=%d\n", fb->width, mode->hdisplay);
		return -EINVAL;
		} else if (fb->height != mode->vdisplay) {
		DPU_ERROR("invalid fb h=%d, mode h=%d\n", fb->height, mode->vdisplay);
		return -EINVAL;
		} else if (fb->width > dpu_wb_conn->maxlinewidth) {
		DPU_ERROR("invalid fb w=%d, maxlinewidth=%u\n",
		fb->width, dpu_wb_conn->maxlinewidth);
		return -EINVAL;
		}

		return drm_atomic_helper_check_wb_connector_state(conn_state->connector, conn_state->state);
		}

		static const struct drm_connector_funcs dpu_wb_conn_funcs = {
		.reset = drm_atomic_helper_connector_reset,
		.fill_modes = drm_helper_probe_single_connector_modes,
		@@ -59,12 +115,13 @@ static void dpu_wb_conn_cleanup_job(struct drm_writeback_connector *connector,

		static const struct drm_connector_helper_funcs dpu_wb_conn_helper_funcs = {
		.get_modes = dpu_wb_conn_get_modes,
		.atomic_check = dpu_wb_conn_atomic_check,
		.prepare_writeback_job = dpu_wb_conn_prepare_job,
		.cleanup_writeback_job = dpu_wb_conn_cleanup_job,
		};

		int dpu_writeback_init(struct drm_device dev, struct drm_encoder enc,
		const u32 *format_list, u32 num_formats)
		const u32 *format_list, u32 num_formats, u32 maxlinewidth)
		{
		struct dpu_wb_connector *dpu_wb_conn;
		int rc = 0;
		@@ -73,6 +130,8 @@ int dpu_writeback_init(struct drm_device dev, struct drm_encoder enc,
		if (!dpu_wb_conn)
		return -ENOMEM;

		dpu_wb_conn->maxlinewidth = maxlinewidth;

		drm_connector_helper_add(&dpu_wb_conn->base.base, &dpu_wb_conn_helper_funcs);

		/* DPU initializes the encoder and sets it up completely for writeback

drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		struct dpu_wb_connector {
		struct drm_writeback_connector base;
		struct drm_encoder *wb_enc;
		u32 maxlinewidth;
		};

		static inline struct dpu_wb_connector to_dpu_wb_conn(struct drm_writeback_connector conn)
		@@ -26,6 +27,6 @@ static inline struct dpu_wb_connector *to_dpu_wb_conn(struct drm_writeback_conne
		}

		int dpu_writeback_init(struct drm_device dev, struct drm_encoder enc,
		const u32 *format_list, u32 num_formats);
		const u32 *format_list, u32 num_formats, u32 maxlinewidth);

		#endif /_DPU_WRITEBACK_H /