From patchwork Sun Feb 20 11:02:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indan Zupancic X-Patchwork-Id: 575841 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1KFcpfr018588 for ; Sun, 20 Feb 2011 15:39:12 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E96859E84F for ; Sun, 20 Feb 2011 07:38:50 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.78]) by gabe.freedesktop.org (Postfix) with ESMTP id C095A9E765 for ; Sun, 20 Feb 2011 07:38:40 -0800 (PST) Received: from smtp.greenhost.nl ([195.190.28.76]) by smarthost1.greenhost.nl with esmtp (Exim 4.69) (envelope-from ) id 1Pr746-0005QY-4T; Sun, 20 Feb 2011 12:02:58 +0100 Received: from webmail.lan ([10.10.12.29] helo=webmail.greenhost.nl) by smtp.greenhost.nl with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Pr745-00073U-W7; Sun, 20 Feb 2011 12:02:58 +0100 Received: from 121.223.142.26 (SquirrelMail authenticated user indan) by webmail.greenhost.nl with HTTP; Sun, 20 Feb 2011 12:02:58 +0100 (CET) Message-ID: <95a30235b6074bd31fa18d72dbfab8ff.squirrel@webmail.greenhost.nl> In-Reply-To: <20110220092012.GA3514@viiv.ffwll.ch> References: <3f9bbd0924f54f6241cc16293fbcbbb4.squirrel@webmail.greenhost.nl> <20110219182511.GA3977@viiv.ffwll.ch> <92f5b87a3559ed7f1b7c46b7497c1ad5.squirrel@webmail.greenhost.nl> <20110220092012.GA3514@viiv.ffwll.ch> Date: Sun, 20 Feb 2011 12:02:58 +0100 (CET) Subject: Re: [BUG] drm/i915 Screen corruption introduced by a00b10c360b35d6431a94cb From: "Indan Zupancic" To: "Daniel Vetter" User-Agent: SquirrelMail/1.4.17 MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: 0.0 X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_50 autolearn=disabled version=3.2.5 X-Scan-Signature: 1629bd954af37e9bd463cbe85bf61e19 Cc: Indan Zupancic , LKML , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 20 Feb 2011 15:39:12 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 936ddd8..e3fc333 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4925,7 +4925,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, if (IS_ERR(page)) return PTR_ERR(page); - src = kmap_atomic(obj_priv->pages[i]); + src = kmap_atomic(page); dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE); memcpy(dst, src, PAGE_SIZE); kunmap_atomic(src); diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c index 75a3d7f..e1cc56a 100644 --- a/arch/x86/mm/iomap_32.c +++ b/arch/x86/mm/iomap_32.c @@ -61,7 +61,8 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) pagefault_disable(); - type = kmap_atomic_idx_push(); +// type = kmap_atomic_idx_push(); + type = 0; idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); set_pte(kmap_pte - idx, pfn_pte(pfn, prot)); @@ -98,7 +99,8 @@ iounmap_atomic(void __iomem *kvaddr) vaddr <= __fix_to_virt(FIX_KMAP_BEGIN)) { int idx, type; - type = kmap_atomic_idx_pop(); +// type = kmap_atomic_idx_pop(); + type = 0; idx = type + KM_TYPE_NR * smp_processor_id(); #ifdef CONFIG_DEBUG_HIGHMEM