LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH] drm/i915,agp/intel: Do not clear stolen entries
Date: Fri, 21 Jan 2011 17:26:50 +0100	[thread overview]
Message-ID: <20110121162650.GB28563@jolsa.brq.redhat.com> (raw)
In-Reply-To: <1295607537-877-1-git-send-email-chris@chris-wilson.co.uk>

this patch fixed the issue for me

Tested-by: Jiri Olsa <jolsa@redhat.com>
if needed :)

thanks,
jirka


On Fri, Jan 21, 2011 at 10:58:57AM +0000, Chris Wilson wrote:
> We can only utilize the stolen portion of the GTT if we are in sole
> charge of the hardware. This is only true if using GEM and KMS,
> otherwise VESA continues to access stolen memory.
> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/char/agp/intel-gtt.c    |   18 ++++++++----------
>  drivers/gpu/drm/i915/i915_gem.c |    6 ++++--
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> index 826ab09..cbbcaba 100644
> --- a/drivers/char/agp/intel-gtt.c
> +++ b/drivers/char/agp/intel-gtt.c
> @@ -68,6 +68,7 @@ static struct _intel_private {
>  	phys_addr_t gma_bus_addr;
>  	u32 PGETBL_save;
>  	u32 __iomem *gtt;		/* I915G */
> +	bool clear_fake_agp; /* on first access via agp, fill with scratch */
>  	int num_dcache_entries;
>  	union {
>  		void __iomem *i9xx_flush_page;
> @@ -869,21 +870,12 @@ static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge)
>  
>  static int intel_fake_agp_configure(void)
>  {
> -	int i;
> -
>  	if (!intel_enable_gtt())
>  	    return -EIO;
>  
> +	intel_private.clear_fake_agp = true;
>  	agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;
>  
> -	for (i = 0; i < intel_private.base.gtt_total_entries; i++) {
> -		intel_private.driver->write_entry(intel_private.scratch_page_dma,
> -						  i, 0);
> -	}
> -	readl(intel_private.gtt+i-1);	/* PCI Posting. */
> -
> -	global_cache_flush();
> -
>  	return 0;
>  }
>  
> @@ -945,6 +937,12 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,
>  {
>  	int ret = -EINVAL;
>  
> +	if (intel_private.clear_fake_agp) {
> +		intel_gtt_clear_range(intel_private.base.stolen_size / PAGE_SIZE,
> +				      intel_private.base.gtt_total_entries);
> +		intel_private.clear_fake_agp = false;
> +	}
> +
>  	if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)
>  		return i810_insert_dcache_entries(mem, pg_start, type);
>  
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 812b97b..6542e7d 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -140,12 +140,14 @@ void i915_gem_do_init(struct drm_device *dev,
>  {
>  	drm_i915_private_t *dev_priv = dev->dev_private;
>  
> -	drm_mm_init(&dev_priv->mm.gtt_space, start,
> -		    end - start);
> +	drm_mm_init(&dev_priv->mm.gtt_space, start, end - start);
>  
>  	dev_priv->mm.gtt_total = end - start;
>  	dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start;
>  	dev_priv->mm.gtt_mappable_end = mappable_end;
> +
> +	/* Take over this portion of the GTT */
> +	intel_gtt_clear_range(start / PAGE_SIZE, end / PAGE_SIZE);
>  }
>  
>  int
> -- 
> 1.7.2.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

  reply	other threads:[~2011-01-21 16:27 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-20 18:12 [BISECTED] agp/intel: revert "Remove confusion of stolen entries not stolen memory" Arnd Bergmann
2010-12-20 18:53 ` Chris Wilson
2010-12-20 19:47   ` Arnd Bergmann
2010-12-20 19:52     ` Chris Wilson
2010-12-20 20:52       ` Arnd Bergmann
2010-12-20 21:06         ` Chris Wilson
2010-12-20 21:54           ` Arnd Bergmann
2010-12-20 22:08             ` Dave Airlie
2011-01-20 23:24           ` Frederic Weisbecker
2011-01-21 10:58             ` [PATCH] drm/i915,agp/intel: Do not clear stolen entries Chris Wilson
2011-01-21 16:26               ` Jiri Olsa [this message]
2011-01-23  1:12               ` Frederic Weisbecker
2011-01-23 11:01                 ` Chris Wilson
2011-01-23 17:59                   ` Frederic Weisbecker
2011-01-24  7:40                     ` Hugh Dickins
2011-01-24 10:10                       ` Chris Wilson
2011-01-26 21:39                         ` Arnd Bergmann
2011-01-28 22:00                         ` Hugh Dickins
2011-01-29  2:59                           ` Mario Kleiner
2011-01-30  0:28                             ` Hugh Dickins
2011-01-30  4:13                               ` Mario Kleiner
2011-01-30  9:55                                 ` Chris Wilson
2011-01-31 10:57                                   ` [PATCH] drm/i915: Suppress spurious vblank interrupts Chris Wilson
2011-02-01 17:34                                     ` Hugh Dickins
2011-02-01 17:46                                       ` Chris Wilson
2011-02-01 17:46                                       ` Jesse Barnes
2011-02-01 18:08                                         ` Jesse Barnes
2011-02-01 18:46                                           ` Hugh Dickins
2011-02-01 19:32                                             ` Jesse Barnes
2011-02-02  3:37                                               ` Hugh Dickins
2011-02-02 17:18                                                 ` Jesse Barnes
2011-02-08 19:52                                                   ` Hugh Dickins
2011-02-10 10:16                                                     ` [PATCH] drm/i915/tv: Use polling rather than interrupt-based hotplug Chris Wilson
2011-02-11  6:34                                                       ` Hugh Dickins
2011-02-11 18:21                                                     ` [PATCH] drm/i915: Suppress spurious vblank interrupts Mario Kleiner
2011-02-14 17:41                                                       ` Hugh Dickins
2011-06-18  4:40                                                         ` Hugh Dickins
2011-01-30  8:52                               ` [PATCH] drm/i915,agp/intel: Do not clear stolen entries Chris Clayton
2011-01-21 16:05             ` [BISECTED] agp/intel: revert "Remove confusion of stolen entries not stolen memory" Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110121162650.GB28563@jolsa.brq.redhat.com \
    --to=jolsa@redhat.com \
    --cc=arnd@arndb.de \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH] drm/i915,agp/intel: Do not clear stolen entries' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).