Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Mar 2009 03:36:24 +0000 (UTC)
From:      Robert Noland <rnoland@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r189909 - head/sys/dev/drm
Message-ID:  <200903170336.n2H3aOpL080142@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rnoland
Date: Tue Mar 17 03:36:24 2009
New Revision: 189909
URL: http://svn.freebsd.org/changeset/base/189909

Log:
  Change the logic around to match ati_pcigart.
  
  MFC after:	3 days

Modified:
  head/sys/dev/drm/r600_cp.c

Modified: head/sys/dev/drm/r600_cp.c
==============================================================================
--- head/sys/dev/drm/r600_cp.c	Tue Mar 17 03:32:12 2009	(r189908)
+++ head/sys/dev/drm/r600_cp.c	Tue Mar 17 03:36:24 2009	(r189909)
@@ -174,7 +174,6 @@ int r600_page_table_init(struct drm_devi
 		if (entry->busaddr[i] == 0) {
 			DRM_ERROR("unable to map PCIGART pages!\n");
 			r600_page_table_cleanup(dev, gart_info);
-			ret = -EINVAL;
 			goto done;
 		}
 #endif
@@ -193,6 +192,7 @@ int r600_page_table_init(struct drm_devi
 			entry_addr += ATI_PCIGART_PAGE_SIZE;
 		}
 	}
+	ret = 1;
 #ifdef __linux__
 done:
 #endif
@@ -2100,7 +2100,7 @@ int r600_do_init_cp(struct drm_device *d
 			  dev_priv->gart_info.addr,
 			  dev_priv->pcigart_offset);
 
-		if (r600_page_table_init(dev)) {
+		if (!r600_page_table_init(dev)) {
 			DRM_ERROR("Failed to init GART table\n");
 			r600_do_cleanup_cp(dev);
 			return -EINVAL;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903170336.n2H3aOpL080142>