* [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth
@ 2012-12-31 1:34 Aaro Koskinen
2013-01-01 1:21 ` Marcin Slusarz
0 siblings, 1 reply; 3+ messages in thread
From: Aaro Koskinen @ 2012-12-31 1:34 UTC (permalink / raw)
To: David Airlie, dri-devel, linux-kernel; +Cc: Aaro Koskinen
Check that the AGP aperture can be mapped. This follows a similar change
done for Radeon (commit 365048ff, drm/radeon: AGP memory is only I/O if
the aperture can be mapped by the CPU.).
The patch fixes the following error seen on G5 iMac:
nouveau E[ DRM] failed to create kernel channel, -12
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 5614c89..69d7b1d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
if (drm->agp.stat == ENABLED) {
mem->bus.offset = mem->start << PAGE_SHIFT;
mem->bus.base = drm->agp.base;
- mem->bus.is_iomem = true;
+ mem->bus.is_iomem = !dev->agp->cant_use_aperture;
}
#endif
break;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth
2012-12-31 1:34 [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth Aaro Koskinen
@ 2013-01-01 1:21 ` Marcin Slusarz
2013-01-04 6:11 ` Dave Airlie
0 siblings, 1 reply; 3+ messages in thread
From: Marcin Slusarz @ 2013-01-01 1:21 UTC (permalink / raw)
To: Aaro Koskinen, Ben Skeggs; +Cc: David Airlie, dri-devel, linux-kernel, stefan
On Mon, Dec 31, 2012 at 03:34:59AM +0200, Aaro Koskinen wrote:
> Check that the AGP aperture can be mapped. This follows a similar change
> done for Radeon (commit 365048ff, drm/radeon: AGP memory is only I/O if
> the aperture can be mapped by the CPU.).
>
> The patch fixes the following error seen on G5 iMac:
>
> nouveau E[ DRM] failed to create kernel channel, -12
>
> Reviewed-by: Michel Dänzer <michel@daenzer.net>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> ---
This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=58806.
For some (weird) reason Nouveau worked on this configuration on 3.6 kernel,
so cc'ing stable@vger seems to be appropriate.
> drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 5614c89..69d7b1d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> if (drm->agp.stat == ENABLED) {
> mem->bus.offset = mem->start << PAGE_SHIFT;
> mem->bus.base = drm->agp.base;
> - mem->bus.is_iomem = true;
> + mem->bus.is_iomem = !dev->agp->cant_use_aperture;
> }
> #endif
> break;
> --
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth
2013-01-01 1:21 ` Marcin Slusarz
@ 2013-01-04 6:11 ` Dave Airlie
0 siblings, 0 replies; 3+ messages in thread
From: Dave Airlie @ 2013-01-04 6:11 UTC (permalink / raw)
To: Marcin Slusarz
Cc: Aaro Koskinen, Ben Skeggs, David Airlie, dri-devel, linux-kernel,
stefan
On Tue, Jan 1, 2013 at 11:21 AM, Marcin Slusarz
<marcin.slusarz@gmail.com> wrote:
> On Mon, Dec 31, 2012 at 03:34:59AM +0200, Aaro Koskinen wrote:
>> Check that the AGP aperture can be mapped. This follows a similar change
>> done for Radeon (commit 365048ff, drm/radeon: AGP memory is only I/O if
>> the aperture can be mapped by the CPU.).
>>
>> The patch fixes the following error seen on G5 iMac:
>>
>> nouveau E[ DRM] failed to create kernel channel, -12
>>
>> Reviewed-by: Michel Dänzer <michel@daenzer.net>
>> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>> ---
>
> This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=58806.
> For some (weird) reason Nouveau worked on this configuration on 3.6 kernel,
> so cc'ing stable@vger seems to be appropriate.
Cool I've picked this up and applied it for stable into fixes now.
Dave.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-04 6:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-31 1:34 [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth Aaro Koskinen
2013-01-01 1:21 ` Marcin Slusarz
2013-01-04 6:11 ` Dave Airlie
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).