iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Dave Airlie
2016-09-17 07:57:55 +10:00
parent 9929c09767 ea90383837
commit 09cb5b78af
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/vc4/vc4_bo.c
View File

@ -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]; 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); struct vc4_dev *vc4 = to_vc4_dev(dev);

10
drivers/gpu/drm/vc4/vc4_validate_shaders.c
View File

@ -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 * of uniforms on each side. However, this scheme is easy to
* validate so it's all we allow for now. * validate so it's all we allow for now.
*/ */
switch (QPU_GET_FIELD(inst, QPU_SIG)) {
if (QPU_GET_FIELD(inst, QPU_SIG) != QPU_SIG_NONE) { 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 " DRM_ERROR("uniforms address change must be "
"normal math\n"); "normal math\n");
return false; return false;