Fri May 2 14:36:10 2014 UTC ()
Cast from uint32_t to bus_addr_t earlier, since it may exceed 32 bits.


(riastradh)
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c
cvs diff -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/Attic/i915_gem_gtt.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/i915drm/Attic/i915_gem_gtt.c 2014/05/01 14:37:36 1.4
+++ src/sys/external/bsd/drm2/i915drm/Attic/i915_gem_gtt.c 2014/05/02 14:36:10 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: i915_gem_gtt.c,v 1.4 2014/05/01 14:37:36 riastradh Exp $ */ 1/* $NetBSD: i915_gem_gtt.c,v 1.5 2014/05/02 14:36:10 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.4 2014/05/01 14:37:36 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.5 2014/05/02 14:36:10 riastradh Exp $");
34 34
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/bus.h> 37#include <sys/bus.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40 40
41#include <dev/pci/pcivar.h> 41#include <dev/pci/pcivar.h>
42 42
43#include <dev/pci/agpvar.h> 43#include <dev/pci/agpvar.h>
44#include <dev/pci/agp_i810var.h> 44#include <dev/pci/agp_i810var.h>
45 45
46#include <drm/drmP.h> 46#include <drm/drmP.h>
@@ -546,27 +546,27 @@ gen6_pte_encode(struct drm_device *dev,  @@ -546,27 +546,27 @@ gen6_pte_encode(struct drm_device *dev,
546 default: 546 default:
547 panic("invalid i915 GTT cache level: %d", (int)level); 547 panic("invalid i915 GTT cache level: %d", (int)level);
548 break; 548 break;
549 } 549 }
550 550
551 return (gen6_pte_addr_encode(addr) | flags); 551 return (gen6_pte_addr_encode(addr) | flags);
552} 552}
553 553
554static bus_addr_t __diagused 554static bus_addr_t __diagused
555gen6_pte_decode(gtt_pte_t pte) 555gen6_pte_decode(gtt_pte_t pte)
556{ 556{
557 const uint32_t addr = (pte & ~(uint32_t)0xf); 557 const uint32_t addr = (pte & ~(uint32_t)0xf);
558 558
559 return ((addr & 0xff0) << 28) | (addr & ~(uint32_t)0xff0); 559 return ((bus_addr_t)(addr & 0xff0) << 28) | (addr & ~(uint32_t)0xff0);
560} 560}
561 561
562static int 562static int
563gen6_gtt_init(struct drm_device *dev) 563gen6_gtt_init(struct drm_device *dev)
564{ 564{
565 struct drm_i915_private *const dev_priv = dev->dev_private; 565 struct drm_i915_private *const dev_priv = dev->dev_private;
566 struct pci_attach_args *const pa = &dev->pdev->pd_pa; 566 struct pci_attach_args *const pa = &dev->pdev->pd_pa;
567 struct intel_gtt *gtt = dev_priv->mm.gtt; 567 struct intel_gtt *gtt = dev_priv->mm.gtt;
568 uint16_t snb_gmch_ctl, ggms, gms; 568 uint16_t snb_gmch_ctl, ggms, gms;
569 int ret; 569 int ret;
570 570
571 gtt->do_idle_maps = false; 571 gtt->do_idle_maps = false;
572 572