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

Commit 09cb5b78 authored Sep 17, 2016 by Dave Airlie

Merge tag 'drm-vc4-fixes-2016-09-14' of https://github.com/anholt/linux into drm-fixes

This pull request brings in a fix for crashes in X on VC4.

* tag 'drm-vc4-fixes-2016-09-14' of https://github.com/anholt/linux:
  drm/vc4: mark vc4_bo_cache_purge() static
  drm/vc4: Allow some more signals to be packed with uniform resets.

parents 9929c097 ea903838

drivers/gpu/drm/vc4/vc4_bo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static struct list_head vc4_get_cache_list_for_size(struct drm_device dev,
		return &vc4->bo_cache.size_list[page_index];
		}

		void vc4_bo_cache_purge(struct drm_device *dev)
		static void vc4_bo_cache_purge(struct drm_device *dev)
		{
		struct vc4_dev *vc4 = to_vc4_dev(dev);

drivers/gpu/drm/vc4/vc4_validate_shaders.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -309,8 +309,14 @@ validate_uniform_address_write(struct vc4_validated_shader_info *validated_shade
		* of uniforms on each side. However, this scheme is easy to
		* validate so it's all we allow for now.
		*/

		if (QPU_GET_FIELD(inst, QPU_SIG) != QPU_SIG_NONE) {
		switch (QPU_GET_FIELD(inst, QPU_SIG)) {
		case QPU_SIG_NONE:
		case QPU_SIG_SCOREBOARD_UNLOCK:
		case QPU_SIG_COLOR_LOAD:
		case QPU_SIG_LOAD_TMU0:
		case QPU_SIG_LOAD_TMU1:
		break;
		default:
		DRM_ERROR("uniforms address change must be "
		"normal math\n");
		return false;