From: Daniel Vetter Subject: Re: [PATCH 07/13] drm/i915: Stop using gtt_total_entries Date: Fri, 18 Jan 2013 00:04:24 +0100 Message-ID: <20130117230424.GR8347@phenom.ffwll.local> References: <1358455524-5331-1-git-send-email-ben@bwidawsk.net> <1358455524-5331-8-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FE4CE5C49 for ; Thu, 17 Jan 2013 15:02:23 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id d4so1459691eek.8 for ; Thu, 17 Jan 2013 15:02:22 -0800 (PST) Content-Disposition: inline In-Reply-To: <1358455524-5331-8-git-send-email-ben@bwidawsk.net> 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: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Jan 17, 2013 at 12:45:18PM -0800, Ben Widawsky wrote: > Similar to gtt_mappable_entries we don't usually want the entries, > it's easy enough to calculate it when you need. > > v2: Move relevant fields above pre-gen6 init > > Reviewed-by: Rodrigo Vivi > Signed-off-by: Ben Widawsky [snip] > @@ -687,11 +690,18 @@ int i915_gem_gtt_init(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > phys_addr_t gtt_bus_addr; > + u32 gtt_size; > u16 snb_gmch_ctl; > int ret; > > + if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(40))) > + pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(40)); > + > + pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl); > dev_priv->gtt.mappable_base = pci_resource_start(dev->pdev, 2); > dev_priv->gtt.mappable_end = pci_resource_len(dev->pdev, 2); > + gtt_size = gen6_get_total_gtt_size(snb_gmch_ctl); Calculating gtt size like this doesn't work too well on pre-gen6. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch