From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/5] drm/i915: rewrite shmem_pwrite_slow to use copy_from_user Date: Sat, 17 Sep 2011 22:52:20 +0200 Message-ID: <20110917205220.GC2856@phenom.ffwll.local> References: <1316285749-30130-1-git-send-email-daniel.vetter@ffwll.ch> <1316285749-30130-5-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 682609E77C for ; Sat, 17 Sep 2011 13:51:53 -0700 (PDT) Received: by fxg7 with SMTP id 7so3431282fxg.36 for ; Sat, 17 Sep 2011 13:51:52 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1316285749-30130-5-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Sat, Sep 17, 2011 at 08:55:48PM +0200, Daniel Vetter wrote: > out: > - for (i = 0; i < pinned_pages; i++) > - page_cache_release(user_pages[i]); > - drm_free_large(user_pages); > + mutex_lock(&dev->struct_mutex); > + /* Fixup: Kill any reinstated backing storage pages */ > + if (obj->madv == __I915_MADV_PURGED) > + i915_gem_object_truncate(obj); > + /* and flush dirty cachelines in case the object isn't in the cpu write > + * domain anymore. */ > + if (obj->base.write_domain != I915_GEM_DOMAIN_CPU) > + i915_gem_clflush_object(obj); Meh, just noticed that I'm missing an intel_gtt_chipset_flush() here ... -Daniel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48