Messages in this thread | | | Date | Thu, 22 May 2014 15:40:35 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm tree with the drm-intel-fixes tree |
| |
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit f93e94efebbe ("drm/i915: Fix dynamic allocation of physical handles") from the drm-intel-fixes tree and commit c8725f3dc091 ("drm/i915: Do not call retire_requests from wait_for_rendering") from the drm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/i915/i915_gem.c index 3326770c9ed2,e1fa919017e2..000000000000 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@@ -43,7 -43,14 +43,9 @@@ static void i915_gem_object_flush_cpu_w static __must_check int i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj, bool readonly); + static void + i915_gem_object_retire(struct drm_i915_gem_object *obj); -static int i915_gem_phys_pwrite(struct drm_device *dev, - struct drm_i915_gem_object *obj, - struct drm_i915_gem_pwrite *args, - struct drm_file *file); - static void i915_gem_write_fence(struct drm_device *dev, int reg, struct drm_i915_gem_object *obj); static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj, [unhandled content-type:application/pgp-signature] | |