Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e85e6ca authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-fixes-5.3-2019-08-21' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



drm-fixes-5.3-2019-08-21:

amdgpu:
- Fix gfxoff logic on RV
- Powerplay fixes
- Fix a possible memory leak in CS ioctl
- bpc fix for display

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190822021022.3356-1-alexander.deucher@amd.com
parents 2ba552b2 ec6e4913

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+7 −2
Original line number Diff line number Diff line
@@ -1143,6 +1143,9 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p, 
	num_deps = chunk->length_dw * 4 /

		sizeof(struct drm_amdgpu_cs_chunk_sem);



	if (p->post_deps)

		return -EINVAL;



	p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),

				     GFP_KERNEL);

	p->num_post_deps = 0;
@@ -1166,8 +1169,7 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p, 




static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p,

						      struct amdgpu_cs_chunk

						      *chunk)

						      struct amdgpu_cs_chunk *chunk)

{

	struct drm_amdgpu_cs_chunk_syncobj *syncobj_deps;

	unsigned num_deps;
@@ -1177,6 +1179,9 @@ static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p 
	num_deps = chunk->length_dw * 4 /

		sizeof(struct drm_amdgpu_cs_chunk_syncobj);



	if (p->post_deps)

		return -EINVAL;



	p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),

				     GFP_KERNEL);

	p->num_post_deps = 0;

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+4 −0
Original line number Diff line number Diff line
@@ -604,6 +604,10 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev) 
		    (adev->gfx.rlc_feature_version < 1) ||

		    !adev->gfx.rlc.is_rlc_v2_1)

			adev->pm.pp_feature &= ~PP_GFXOFF_MASK;

		if (adev->pm.pp_feature & PP_GFXOFF_MASK)

			adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |

				AMD_PG_SUPPORT_CP |

				AMD_PG_SUPPORT_RLC_SMU_HS;

		break;

	default:

		break;

drivers/gpu/drm/amd/amdgpu/nv.c

+0 −1
Original line number Diff line number Diff line
@@ -552,7 +552,6 @@ static int nv_common_early_init(void *handle) 
			AMD_CG_SUPPORT_BIF_LS;

		adev->pg_flags = AMD_PG_SUPPORT_VCN |

			AMD_PG_SUPPORT_VCN_DPG |

			AMD_PG_SUPPORT_MMHUB |

			AMD_PG_SUPPORT_ATHUB;

		adev->external_rev_id = adev->rev_id + 0x1;

		break;

drivers/gpu/drm/amd/amdgpu/soc15.c

+0 −5
Original line number Diff line number Diff line
@@ -992,11 +992,6 @@ static int soc15_common_early_init(void *handle) 


			adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN;

		}



		if (adev->pm.pp_feature & PP_GFXOFF_MASK)

			adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |

				AMD_PG_SUPPORT_CP |

				AMD_PG_SUPPORT_RLC_SMU_HS;

		break;

	default:

		/* FIXME: not supported yet */

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+14 −2
Original line number Diff line number Diff line
@@ -3131,13 +3131,25 @@ static enum dc_color_depth 
convert_color_depth_from_display_info(const struct drm_connector *connector,

				      const struct drm_connector_state *state)

{

	uint32_t bpc = connector->display_info.bpc;

	uint8_t bpc = (uint8_t)connector->display_info.bpc;



	/* Assume 8 bpc by default if no bpc is specified. */

	bpc = bpc ? bpc : 8;



	if (!state)

		state = connector->state;



	if (state) {

		bpc = state->max_bpc;

		/*

		 * Cap display bpc based on the user requested value.

		 *

		 * The value for state->max_bpc may not correctly updated

		 * depending on when the connector gets added to the state

		 * or if this was called outside of atomic check, so it

		 * can't be used directly.

		 */

		bpc = min(bpc, state->max_requested_bpc);



		/* Round down to the nearest even number. */

		bpc = bpc - (bpc & 1);

	}