Merge tag 'exynos-drm-next-for-v5.7' of... (7c2cb99f) · Commits · 戴 / test

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ static void decon_ctx_remove(struct decon_context *ctx)
		static u32 decon_calc_clkdiv(struct decon_context *ctx,
		const struct drm_display_mode *mode)
		{
		unsigned long ideal_clk = mode->htotal * mode->vtotal * mode->vrefresh;
		unsigned long ideal_clk = mode->clock;
		u32 clkdiv;

		/* Find the clock divider value that gets us closest to ideal_clk */

+2 −3

Original line number	Diff line number	Diff line
		@@ -270,7 +270,7 @@ static int exynos_drm_bind(struct device *dev)
		struct drm_encoder *encoder;
		struct drm_device *drm;
		unsigned int clone_mask;
		int cnt, ret;
		int ret;

		drm = drm_dev_alloc(&exynos_drm_driver, dev);
		if (IS_ERR(drm))
		@@ -293,10 +293,9 @@ static int exynos_drm_bind(struct device *dev)
		exynos_drm_mode_config_init(drm);

		/* setup possible_clones. */
		cnt = 0;
		clone_mask = 0;
		list_for_each_entry(encoder, &drm->mode_config.encoder_list, head)
		clone_mask \|= (1 << (cnt++));
		clone_mask \|= drm_encoder_mask(encoder);

		list_for_each_entry(encoder, &drm->mode_config.encoder_list, head)
		encoder->possible_clones = clone_mask;