From 47a9c5301854ef78da56e1cbb49626a9757ee5b9 Mon Sep 17 00:00:00 2001

From: Haneen Mohammed <hamohammed.sa@gmail.com>

Date: Wed, 27 Sep 2017 12:23:17 -0600

Subject: [PATCH 84/86] drm/rockchip: Rely on the default best_encoder()

 behavior

Git-commit: 7f909d9c74f3894ba8bca426ead8ccbe7282d950

Patch-mainline: Queued

Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

References: fate#323912

Since the output has 1:1 relationship between connectors and encoders,

and the driver is relying on the atomic helpers, remove the custom

best_encoder() and let the core call drm_atomic_helper_best_encoder().

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>

Signed-off-by: Sean Paul <seanpaul@chromium.org>

Link: https://patchwork.freedesktop.org/patch/msgid/20170927182317.GA8249@Haneen

Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>

---

 drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 ---------

 1 file changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c

index 9b0b0588bbed..4588b9e107d2 100644

--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c

+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c

@@ -288,14 +288,6 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)

 	return ret;

 }

-static struct drm_encoder *

-cdn_dp_connector_best_encoder(struct drm_connector *connector)

-{

-	struct cdn_dp_device *dp = connector_to_dp(connector);

-

-	return &dp->encoder;

-}

-

 static int cdn_dp_connector_mode_valid(struct drm_connector *connector,

 				       struct drm_display_mode *mode)

 {

@@ -347,7 +339,6 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,

 static struct drm_connector_helper_funcs cdn_dp_connector_helper_funcs = {

 	.get_modes = cdn_dp_connector_get_modes,

-	.best_encoder = cdn_dp_connector_best_encoder,

 	.mode_valid = cdn_dp_connector_mode_valid,

 };

-- 

2.11.0