Commit 7c2cb99f authored by Dave Airlie's avatar Dave Airlie

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

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

Two cleanups
. Replace the hand rolled encoder bitmask thing with drm_encoder_mask()
. Use mode->clock instead of reverse calculating it from the vrefresh
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1584320957-9442-1-git-send-email-inki.dae@samsung.com
parents d5152d35 e2ed1355
...@@ -139,7 +139,7 @@ static void decon_ctx_remove(struct decon_context *ctx) ...@@ -139,7 +139,7 @@ static void decon_ctx_remove(struct decon_context *ctx)
static u32 decon_calc_clkdiv(struct decon_context *ctx, static u32 decon_calc_clkdiv(struct decon_context *ctx,
const struct drm_display_mode *mode) const struct drm_display_mode *mode)
{ {
unsigned long ideal_clk = mode->htotal * mode->vtotal * mode->vrefresh; unsigned long ideal_clk = mode->clock;
u32 clkdiv; u32 clkdiv;
/* Find the clock divider value that gets us closest to ideal_clk */ /* Find the clock divider value that gets us closest to ideal_clk */
......
...@@ -270,7 +270,7 @@ static int exynos_drm_bind(struct device *dev) ...@@ -270,7 +270,7 @@ static int exynos_drm_bind(struct device *dev)
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_device *drm; struct drm_device *drm;
unsigned int clone_mask; unsigned int clone_mask;
int cnt, ret; int ret;
drm = drm_dev_alloc(&exynos_drm_driver, dev); drm = drm_dev_alloc(&exynos_drm_driver, dev);
if (IS_ERR(drm)) if (IS_ERR(drm))
...@@ -293,10 +293,9 @@ static int exynos_drm_bind(struct device *dev) ...@@ -293,10 +293,9 @@ static int exynos_drm_bind(struct device *dev)
exynos_drm_mode_config_init(drm); exynos_drm_mode_config_init(drm);
/* setup possible_clones. */ /* setup possible_clones. */
cnt = 0;
clone_mask = 0; clone_mask = 0;
list_for_each_entry(encoder, &drm->mode_config.encoder_list, head) 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) list_for_each_entry(encoder, &drm->mode_config.encoder_list, head)
encoder->possible_clones = clone_mask; encoder->possible_clones = clone_mask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment