[PATCH] radeon_agp_init fixes

[PATCH] radeon_agp_init fixes

[John Kacur]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

radeon_agp_init fixes

John Kacur (2):

  radeon_agp: Fix warning, format ‘%d’ expects type ‘int’, but argument
    4 has type ‘size_t’

  radeon_agp: Move the check of the aper_size after drm_acp_acquire and
    drm_agp_info

 drivers/gpu/drm/radeon/radeon_agp.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

[PATCH] radeon_agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’

[John Kacur]

Fix warning by using %zu instead of %d for size_t

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_agp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index c9ad7f5..1c4e523 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -134,7 +134,7 @@ int radeon_agp_init(struct radeon_device *rdev)
 	int ret;
 
 	if (rdev->ddev->agp->agp_info.aper_size < 32) {
-		dev_warn(rdev->dev, "AGP aperture to small (%dM) "
+		dev_warn(rdev->dev, "AGP aperture to small (%zuM) "
 			"need at least 32M, disabling AGP\n",
 			rdev->ddev->agp->agp_info.aper_size);
 		return -EINVAL;
-- 
1.6.0.6

Re: [PATCH] radeon_agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’

[Dan Nicholson]

On Sat, Jan 30, 2010 at 12:51 PM, John Kacur <jkacur@redhat.com> wrote:
> Fix warning by using %zu instead of %d for size_t
>
> Signed-off-by: John Kacur <jkacur@redhat.com>
> ---
>  drivers/gpu/drm/radeon/radeon_agp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
> index c9ad7f5..1c4e523 100644
> --- a/drivers/gpu/drm/radeon/radeon_agp.c
> +++ b/drivers/gpu/drm/radeon/radeon_agp.c
> @@ -134,7 +134,7 @@ int radeon_agp_init(struct radeon_device *rdev)
>        int ret;
>
>        if (rdev->ddev->agp->agp_info.aper_size < 32) {
> -               dev_warn(rdev->dev, "AGP aperture to small (%dM) "
> +               dev_warn(rdev->dev, "AGP aperture to small (%zuM) "

As long as you're fixing this line, you might want to correct the
grammar s/to/too/.

--
Dan

Re: [PATCH] radeon_agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’

[John Kacur]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1191 bytes --]



On Sun, 31 Jan 2010, Dan Nicholson wrote:

> On Sat, Jan 30, 2010 at 12:51 PM, John Kacur <jkacur@redhat.com> wrote:
> > Fix warning by using %zu instead of %d for size_t
> >
> > Signed-off-by: John Kacur <jkacur@redhat.com>
> > ---
> >  drivers/gpu/drm/radeon/radeon_agp.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
> > index c9ad7f5..1c4e523 100644
> > --- a/drivers/gpu/drm/radeon/radeon_agp.c
> > +++ b/drivers/gpu/drm/radeon/radeon_agp.c
> > @@ -134,7 +134,7 @@ int radeon_agp_init(struct radeon_device *rdev)
> >        int ret;
> >
> >        if (rdev->ddev->agp->agp_info.aper_size < 32) {
> > -               dev_warn(rdev->dev, "AGP aperture to small (%dM) "
> > +               dev_warn(rdev->dev, "AGP aperture to small (%zuM) "
> 
> As long as you're fixing this line, you might want to correct the
> grammar s/to/too/.

Thanks, I saw that too, after I sent. Unfortunately, I have to respin both 
patches, because there is a merge conflict after fixing the 
grammar/spelling mistake.

Both patches coming up, in a separate mail.

John

[PATCH] radeon_agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info

[John Kacur]

First call drm_agp_acquire to check if agp has been acquired.
Second call drm_agp_info to fill in the info data struct, including aper_size.
Finally do the check to see if the aper_size makes sense.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_agp.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index 1c4e523..ad168ee 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -133,13 +133,6 @@ int radeon_agp_init(struct radeon_device *rdev)
 	bool is_v3;
 	int ret;
 
-	if (rdev->ddev->agp->agp_info.aper_size < 32) {
-		dev_warn(rdev->dev, "AGP aperture to small (%zuM) "
-			"need at least 32M, disabling AGP\n",
-			rdev->ddev->agp->agp_info.aper_size);
-		return -EINVAL;
-	}
-
 	/* Acquire AGP. */
 	if (!rdev->ddev->agp->acquired) {
 		ret = drm_agp_acquire(rdev->ddev);
@@ -154,6 +147,14 @@ int radeon_agp_init(struct radeon_device *rdev)
 		DRM_ERROR("Unable to get AGP info: %d\n", ret);
 		return ret;
 	}
+
+	if (rdev->ddev->agp->agp_info.aper_size < 32) {
+		dev_warn(rdev->dev, "AGP aperture to small (%zuM) "
+			"need at least 32M, disabling AGP\n",
+			rdev->ddev->agp->agp_info.aper_size);
+		return -EINVAL;
+	}
+
 	mode.mode = info.mode;
 	agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;
 	is_v3 = !!(agp_status & RADEON_AGPv3_MODE);
-- 
1.6.0.6