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

Commit 2d3bda70 authored by Inki Dae's avatar Inki Dae
Browse files

Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of... 

Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into exynos-drm-next

Fixups
- Fix several problems to IPPv2 merged to mainline recentely.
  . An align problem of width size that IPP driver incorrectly
    calculated the real buffer size.
  . Horizontal and vertical flip problem.
  . Per-plane global alpha for XRGB modes.
  . Incorrect variant of the YUV modes.
- Fix plane overlapping problem.
  . The stange order of overlapping planes on XRGB modes
    by setting global alpha value to maximum value.

Cleanup
- Rename a enum type, drm_ipp_size_id, to one specific to Exynos,
  drm_exynos_ipp_limit_type.
- Replace {un/reference} with {put,get} functions.
  . it replaces several reference/unreference functions with Linux
    kernel nameing standard.
parents 50077507 aab109b3

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
	unsigned long val;



	val = readl(ctx->addr + DECON_WINCONx(win));

	val &= ~WINCONx_BPPMODE_MASK;

	val &= WINCONx_ENWIN_F;



	switch (fb->format->format) {

	case DRM_FORMAT_XRGB1555:
@@ -356,8 +356,8 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 
		writel(val, ctx->addr + DECON_VIDOSDxB(win));

	}



	val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |

		VIDOSD_Wx_ALPHA_B_F(0x0);

	val = VIDOSD_Wx_ALPHA_R_F(0xff) | VIDOSD_Wx_ALPHA_G_F(0xff) |

		VIDOSD_Wx_ALPHA_B_F(0xff);

	writel(val, ctx->addr + DECON_VIDOSDxC(win));



	val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int exynos_drm_bind(struct device *dev) 
err_free_private:

	kfree(private);

err_free_drm:

	drm_dev_unref(drm);

	drm_dev_put(drm);



	return ret;

}
@@ -444,7 +444,7 @@ static void exynos_drm_unbind(struct device *dev) 
	drm->dev_private = NULL;

	dev_set_drvdata(dev, NULL);



	drm_dev_unref(drm);

	drm_dev_put(drm);

}



static const struct component_master_ops exynos_drm_ops = {

drivers/gpu/drm/exynos/exynos_drm_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 


err:

	while (i--)

		drm_gem_object_unreference_unlocked(&exynos_gem[i]->base);

		drm_gem_object_put_unlocked(&exynos_gem[i]->base);



	return ERR_PTR(ret);

}

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+10 −7
Original line number Diff line number Diff line
@@ -470,17 +470,18 @@ static void fimc_src_set_transf(struct fimc_context *ctx, unsigned int rotation) 
static void fimc_set_window(struct fimc_context *ctx,

			    struct exynos_drm_ipp_buffer *buf)

{

	unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];

	u32 cfg, h1, h2, v1, v2;



	/* cropped image */

	h1 = buf->rect.x;

	h2 = buf->buf.width - buf->rect.w - buf->rect.x;

	h2 = real_width - buf->rect.w - buf->rect.x;

	v1 = buf->rect.y;

	v2 = buf->buf.height - buf->rect.h - buf->rect.y;



	DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]hsize[%d]vsize[%d]\n",

		buf->rect.x, buf->rect.y, buf->rect.w, buf->rect.h,

		buf->buf.width, buf->buf.height);

		real_width, buf->buf.height);

	DRM_DEBUG_KMS("h1[%d]h2[%d]v1[%d]v2[%d]\n", h1, h2, v1, v2);



	/*
@@ -503,12 +504,13 @@ static void fimc_set_window(struct fimc_context *ctx, 
static void fimc_src_set_size(struct fimc_context *ctx,

			      struct exynos_drm_ipp_buffer *buf)

{

	unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];

	u32 cfg;



	DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);

	DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);



	/* original size */

	cfg = (EXYNOS_ORGISIZE_HORIZONTAL(buf->buf.width) |

	cfg = (EXYNOS_ORGISIZE_HORIZONTAL(real_width) |

		EXYNOS_ORGISIZE_VERTICAL(buf->buf.height));



	fimc_write(ctx, cfg, EXYNOS_ORGISIZE);
@@ -529,7 +531,7 @@ static void fimc_src_set_size(struct fimc_context *ctx, 
	 * for now, we support only ITU601 8 bit mode

	 */

	cfg = (EXYNOS_CISRCFMT_ITU601_8BIT |

		EXYNOS_CISRCFMT_SOURCEHSIZE(buf->buf.width) |

		EXYNOS_CISRCFMT_SOURCEHSIZE(real_width) |

		EXYNOS_CISRCFMT_SOURCEVSIZE(buf->buf.height));

	fimc_write(ctx, cfg, EXYNOS_CISRCFMT);
@@ -842,12 +844,13 @@ static void fimc_set_scaler(struct fimc_context *ctx, struct fimc_scaler *sc) 
static void fimc_dst_set_size(struct fimc_context *ctx,

			     struct exynos_drm_ipp_buffer *buf)

{

	unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];

	u32 cfg, cfg_ext;



	DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);

	DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);



	/* original size */

	cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(buf->buf.width) |

	cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(real_width) |

		EXYNOS_ORGOSIZE_VERTICAL(buf->buf.height));



	fimc_write(ctx, cfg, EXYNOS_ORGOSIZE);

drivers/gpu/drm/exynos/exynos_drm_gem.c

+5 −5
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int exynos_drm_gem_handle_create(struct drm_gem_object *obj, 
	DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle);



	/* drop reference from allocate - handle holds it now. */

	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return 0;

}
@@ -186,7 +186,7 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev, 


	exynos_gem = to_exynos_gem(obj);



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return exynos_gem->size;

}
@@ -329,13 +329,13 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, 
		return;

	}



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	/*

	 * decrease obj->refcount one more time because we has already

	 * increased it at exynos_drm_gem_get_dma_addr().

	 */

	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);

}



static int exynos_drm_gem_mmap_buffer(struct exynos_drm_gem *exynos_gem,
@@ -383,7 +383,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data, 
	args->flags = exynos_gem->flags;

	args->size = exynos_gem->size;



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return 0;

}