forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'drm-intel-fixes' into drm-intel-next

Browse source 
Conflicts:
	drivers/gpu/drm/i915/i915_gem_evict.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c
This commit is contained in:
Chris Wilson 2010-10-03 10:56:11 +01:00
commit 58e10eb92d
7 changed files with 74 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_gem.c
View file

@ -3379,6 +3379,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
(int) reloc->offset,
reloc->read_domains,
reloc->write_domain);
drm_gem_object_unreference(target_obj);
i915_gem_object_unpin(obj);
return -EINVAL;
}
if (reloc->write_domain & I915_GEM_DOMAIN_CPU ||