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

Commit 331ca3a3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v5.2' of... 

Merge tag 'exynos-drm-next-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Log cleanups
- Correct the use of log macro in error case.
- Drop unnecessary messages.
- Replace DRM_ERROR/DEBUG with DRM_DEV_ERROR/DEBUG.
- Print out debug messages with correct device name in vidi and ipp drivers.

One trivial cleanup
- Just fix checkpatch error, "foo* bar" to "foo *bar" in g2d driver.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1556073313-9923-1-git-send-email-inki.dae@samsung.com
parents 70b5f09e 8b955034

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+2 −4
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void decon_setup_trigger(struct decon_context *ctx) 


	if (regmap_update_bits(ctx->sysreg, DSD_CFG_MUX,

			       DSD_CFG_MUX_TE_UNMASK_GLOBAL, ~0))

		DRM_ERROR("Cannot update sysreg.\n");

		DRM_DEV_ERROR(ctx->dev, "Cannot update sysreg.\n");

}



static void decon_commit(struct exynos_drm_crtc *crtc)
@@ -356,7 +356,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
		break;

	}



	DRM_DEBUG_KMS("cpp = %u\n", fb->format->cpp[0]);

	DRM_DEV_DEBUG_KMS(ctx->dev, "cpp = %u\n", fb->format->cpp[0]);



	/*

	 * In case of exynos, setting dma-burst to 16Word causes permanent
@@ -561,8 +561,6 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) 
	struct decon_context *ctx = crtc->ctx;

	int win, i, ret;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) {

		ret = clk_prepare_enable(ctx->clks[i]);

		if (ret < 0)

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+14 −12
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc) 
	if (!wait_event_timeout(ctx->wait_vsync_queue,

				!atomic_read(&ctx->wait_vsync_event),

				HZ/20))

		DRM_DEBUG_KMS("vblank wait timed out.\n");

		DRM_DEV_DEBUG_KMS(ctx->dev, "vblank wait timed out.\n");

}



static void decon_clear_channels(struct exynos_drm_crtc *crtc)
@@ -107,8 +107,6 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) 
	struct decon_context *ctx = crtc->ctx;

	unsigned int win, ch_enabled = 0;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	/* Check if any channel is enabled. */

	for (win = 0; win < WINDOWS_NR; win++) {

		u32 val = readl(ctx->regs + WINCON(win));
@@ -315,7 +313,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
		break;

	}



	DRM_DEBUG_KMS("cpp = %d\n", fb->format->cpp[0]);

	DRM_DEV_DEBUG_KMS(ctx->dev, "cpp = %d\n", fb->format->cpp[0]);



	/*

	 * In case of exynos, setting dma-burst to 16Word causes permanent
@@ -422,9 +420,9 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 
	writel(state->src.x, ctx->regs + VIDW_OFFSET_X(win));

	writel(state->src.y, ctx->regs + VIDW_OFFSET_Y(win));



	DRM_DEBUG_KMS("start addr = 0x%lx\n",

	DRM_DEV_DEBUG_KMS(ctx->dev, "start addr = 0x%lx\n",

			(unsigned long)val);

	DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",

	DRM_DEV_DEBUG_KMS(ctx->dev, "ovl_width = %d, ovl_height = %d\n",

			state->crtc.w, state->crtc.h);



	val = VIDOSDxA_TOPLEFT_X(state->crtc.x) |
@@ -442,7 +440,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 


	writel(val, ctx->regs + VIDOSD_B(win));



	DRM_DEBUG_KMS("osd pos: tx = %d, ty = %d, bx = %d, by = %d\n",

	DRM_DEV_DEBUG_KMS(ctx->dev, "osd pos: tx = %d, ty = %d, bx = %d, by = %d\n",

			state->crtc.x, state->crtc.y, last_x, last_y);



	/* OSD alpha */
@@ -622,7 +620,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 


	ret = decon_ctx_initialize(ctx, drm_dev);

	if (ret) {

		DRM_ERROR("decon_ctx_initialize failed.\n");

		DRM_DEV_ERROR(dev, "decon_ctx_initialize failed.\n");

		return ret;

	}
@@ -802,25 +800,29 @@ static int exynos7_decon_resume(struct device *dev) 


	ret = clk_prepare_enable(ctx->pclk);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the pclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n",

			      ret);

		return ret;

	}



	ret = clk_prepare_enable(ctx->aclk);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the aclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n",

			      ret);

		return ret;

	}



	ret = clk_prepare_enable(ctx->eclk);

	if  (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the eclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n",

			      ret);

		return ret;

	}



	ret = clk_prepare_enable(ctx->vclk);

	if  (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the vclk [%d]\n", ret);

		DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n",

			      ret);

		return ret;

	}

drivers/gpu/drm/exynos/exynos_dp.c

+6 −3
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data, 


	mode = drm_mode_create(connector->dev);

	if (!mode) {

		DRM_ERROR("failed to create a new display mode.\n");

		DRM_DEV_ERROR(dp->dev,

			      "failed to create a new display mode.\n");

		return num_modes;

	}
@@ -111,7 +112,8 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data, 
	if (dp->ptn_bridge) {

		ret = drm_bridge_attach(&dp->encoder, dp->ptn_bridge, bridge);

		if (ret) {

			DRM_ERROR("Failed to attach bridge to drm\n");

			DRM_DEV_ERROR(dp->dev,

				      "Failed to attach bridge to drm\n");

			bridge->next = NULL;

			return ret;

		}
@@ -147,7 +149,8 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp) 


	ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);

	if (ret) {

		DRM_ERROR("failed: of_get_videomode() : %d\n", ret);

		DRM_DEV_ERROR(dp->dev,

			      "failed: of_get_videomode() : %d\n", ret);

		return ret;

	}

	return 0;

drivers/gpu/drm/exynos/exynos_drm_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
	int ret;



	if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {

		DRM_ERROR("Device %s lacks support for IOMMU\n",

		DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n",

			  dev_name(subdrv_dev));

		return -EINVAL;

	}

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+6 −3
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static int exynos_dpi_get_modes(struct drm_connector *connector) 


		mode = drm_mode_create(connector->dev);

		if (!mode) {

			DRM_ERROR("failed to create a new display mode\n");

			DRM_DEV_ERROR(ctx->dev,

				      "failed to create a new display mode\n");

			return 0;

		}

		drm_display_mode_from_videomode(ctx->vm, mode);
@@ -108,7 +109,8 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder) 
				 &exynos_dpi_connector_funcs,

				 DRM_MODE_CONNECTOR_VGA);

	if (ret) {

		DRM_ERROR("failed to initialize connector with drm\n");

		DRM_DEV_ERROR(ctx->dev,

			      "failed to initialize connector with drm\n");

		return ret;

	}
@@ -213,7 +215,8 @@ int exynos_dpi_bind(struct drm_device *dev, struct drm_encoder *encoder) 


	ret = exynos_dpi_create_connector(encoder);

	if (ret) {

		DRM_ERROR("failed to create connector ret = %d\n", ret);

		DRM_DEV_ERROR(encoder_to_dpi(encoder)->dev,

			      "failed to create connector ret = %d\n", ret);

		drm_encoder_cleanup(encoder);

		return ret;

	}