diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0643-drm-amdgpu-Remove-default-best_encoder-hook-from-DC.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0643-drm-amdgpu-Remove-default-best_encoder-hook-from-DC.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0643-drm-amdgpu-Remove-default-best_encoder-hook-from-DC.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0643-drm-amdgpu-Remove-default-best_encoder-hook-from-DC.patch new file mode 100644 index 00000000..204eb0a7 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0643-drm-amdgpu-Remove-default-best_encoder-hook-from-DC.patch @@ -0,0 +1,87 @@ +From 2a410ee41cc54eb13337fdcc9241b13d34b3abd6 Mon Sep 17 00:00:00 2001 +From: Daniel Vetter <daniel.vetter@ffwll.ch> +Date: Thu, 4 Oct 2018 22:24:26 +0200 +Subject: [PATCH 0643/2940] drm/amdgpu: Remove default best_encoder hook from + DC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For atomic driver this is the default, no need to reimplement it. We +still need to keep the copypasta for not-atomic drivers though, since +no one polished the legacy crtc helpers as much as the atomic ones. + +v2: amdgpu uses ->best_encoder internally, give it a local copy. It +might be a good idea to merge the connector and encoder into one +amdgpu_dm_sink structure, that might match DC internals better. At +least for non-DPMST outputs. Kudos to Ville for spotting this. + +v3: Rebase onto a487411a6481 ("drm/amd/display: Use DRM helper for +best_encoder"). + +Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> +Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> +Cc: Alex Deucher <alexander.deucher@amd.com> +Cc: Harry Wentland <harry.wentland@amd.com> +Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Cc: Tony Cheng <Tony.Cheng@amd.com> +Cc: "Leo (Sunpeng) Li" <sunpeng.li@amd.com> +Cc: Shirish S <shirish.s@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20181004202446.22905-2-daniel.vetter@ffwll.ch +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 900a5bf68c1f..d90f15605161 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -3221,7 +3221,6 @@ amdgpu_dm_connector_helper_funcs = { + */ + .get_modes = get_modes, + .mode_valid = amdgpu_dm_connector_mode_valid, +- .best_encoder = drm_atomic_helper_best_encoder + }; + + static void dm_crtc_helper_disable(struct drm_crtc *crtc) +@@ -3624,14 +3623,17 @@ static int to_drm_connector_type(enum signal_type st) + } + } + ++static struct drm_encoder *amdgpu_dm_connector_to_encoder(struct drm_connector *connector) ++{ ++ return drm_encoder_find(connector->dev, NULL, connector->encoder_ids[0]); ++} ++ + static void amdgpu_dm_get_native_mode(struct drm_connector *connector) + { +- const struct drm_connector_helper_funcs *helper = +- connector->helper_private; + struct drm_encoder *encoder; + struct amdgpu_encoder *amdgpu_encoder; + +- encoder = helper->best_encoder(connector); ++ encoder = amdgpu_dm_connector_to_encoder(connector); + + if (encoder == NULL) + return; +@@ -3758,14 +3760,12 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector, + + static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) + { +- const struct drm_connector_helper_funcs *helper = +- connector->helper_private; + struct amdgpu_dm_connector *amdgpu_dm_connector = + to_amdgpu_dm_connector(connector); + struct drm_encoder *encoder; + struct edid *edid = amdgpu_dm_connector->edid; + +- encoder = helper->best_encoder(connector); ++ encoder = amdgpu_dm_connector_to_encoder(connector); + + if (!edid || !drm_edid_is_valid(edid)) { + amdgpu_dm_connector->num_modes = +-- +2.17.1 + |