Attachment 139102 Details for Bug 106193 – amdgpu_dm.c patch I had to manually apply

[patch] amdgpu_dm.c patch I had to manually apply

amdgpu_dm.c.patch (text/plain), 1.36 KB, created by Joel Sass on 2018-04-25 15:28:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Sass

Created: 2018-04-25 15:28:03 UTC

Size: 1.36 KB

patch

obsolete

>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 63c6734..94136ea 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -4506,6 +4506,7 @@ static int dm_update_crtcs_state(struct dc *dc,
> 		struct amdgpu_dm_connector *aconnector = NULL;
> 		struct drm_connector_state *new_con_state = NULL;
> 		struct dm_connector_state *dm_conn_state = NULL;
>+		struct drm_plane_state *new_plane_state = NULL;
> 
> 		new_stream = NULL;
> 
>@@ -4513,6 +4514,13 @@ static int dm_update_crtcs_state(struct dc *dc,
> 		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
> 		acrtc = to_amdgpu_crtc(crtc);
> 
>+		new_plane_state = drm_atomic_get_new_plane_state(state, new_crtc_state->crtc->primary);
>+
>+		if (new_crtc_state->enable && new_plane_state && !new_plane_state->fb) {
>+			ret = -EINVAL;
>+			goto fail;
>+		}
>+
> 		aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
> 
> 		/* TODO This hack should go away */
>@@ -4685,7 +4693,7 @@ static int dm_update_planes_state(struct dc *dc,
> 			if (!dm_old_crtc_state->stream)
> 				continue;
> 
>-			DRM_DEBUG_DRIVER("Disabling DRM plane: %d on DRM crtc %d\n",
>+			DRM_DEBUG_ATOMIC("Disabling DRM plane: %d on DRM crtc %d\n",
> 					plane->base.id, old_plane_crtc->base.id);
> 
> 			if (!dc_remove_plane_from_context(
>

Actions: View | Splinter Review

Attachments on bug 106193: 139012 | 139013 | 139102

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.