diff options
Diffstat (limited to 'r600_atom.c')
| -rw-r--r-- | r600_atom.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/r600_atom.c b/r600_atom.c index 8008cc3..1254935 100644 --- a/r600_atom.c +++ b/r600_atom.c @@ -14,8 +14,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "radeon.h" #include "radeon_device.h" +#include "r600_atom.h" #include "r600d.h" /* @@ -49,9 +49,6 @@ int r600_cb_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d return -ENOMEM; memcpy(cb, data, sizeof(struct drm_r600_cb)); atom->state = cb; - r = radeon_atom_init(atom, &r600_cb_emit); - if (r) - return r; atom->nflushes = 1; /* take a references on the bo */ atom->bo[0] = radeon_bo_lookup(rdev, cb->handle); @@ -230,9 +227,6 @@ int r600_cb_cntl_create(struct radeon_device *rdev, struct radeon_atom *atom, vo return -ENOMEM; memcpy(cb_cntl, data, sizeof(struct drm_r600_cb_cntl)); atom->state = cb_cntl; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; /* CB_TARGET_MASK */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x0000008E; @@ -286,9 +280,6 @@ int r600_pa_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d return -ENOMEM; memcpy(pa, data, sizeof(struct drm_r600_pa)); atom->state = pa; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; /* PA_SC_MPASS_PS_CNTL */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000292; @@ -376,9 +367,6 @@ int r600_vport_create(struct radeon_device *rdev, struct radeon_atom *atom, void return -ENOMEM; memcpy(vport, data, sizeof(struct drm_r600_vport)); atom->state = vport; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; /* PA_SC_VPORT_ZMIN_0 */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x000000B4; @@ -435,9 +423,6 @@ int r600_blend_create(struct radeon_device *rdev, struct radeon_atom *atom, void return -ENOMEM; memcpy(blend, data, sizeof(struct drm_r600_blend)); atom->state = blend; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; /* CB_BLEND0_CONTROL */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 8); atom->pkts[atom->npkts++] = 0x000001E0; @@ -470,9 +455,6 @@ int r600_constants_create(struct radeon_device *rdev, struct radeon_atom *atom, return -ENOMEM; memcpy(constants, data, sizeof(struct drm_r600_constants)); atom->state = constants; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; if ((constants->nconstants & 0x3) || (constants->offset & 0x3)) { dev_err(rdev->dev, "invalid offset or number of constants (0x%08X %d)\n", constants->offset, constants->nconstants); @@ -518,9 +500,6 @@ int r600_db_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d return -ENOMEM; memcpy(db, data, sizeof(struct drm_r600_db)); atom->state = db; - r = radeon_atom_init(atom, &r600_db_emit); - if (r) - return r; atom->bo[0] = radeon_bo_lookup(rdev, db->db_handle); if (atom->bo[0] == NULL) return -EINVAL; @@ -626,9 +605,6 @@ int r600_db_cntl_create(struct radeon_device *rdev, struct radeon_atom *atom, vo return -ENOMEM; memcpy(db_cntl, data, sizeof(struct drm_r600_db_cntl)); atom->state = db_cntl; - r = radeon_atom_init(atom, &radeon_atom_emit_default); - if (r) - return r; /* DB_STENCIL_CLEAR */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x0000000A; @@ -704,9 +680,6 @@ int r600_vs_shader_create(struct radeon_device *rdev, struct radeon_atom *atom, return -ENOMEM; memcpy(vs_shader, data, sizeof(struct drm_r600_vs_shader)); atom->state = vs_shader; - r = radeon_atom_init(atom, &r600_vs_shader_emit); - if (r) - return r; /* SQ_PGM_START_FS */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000225; @@ -797,9 +770,6 @@ int r600_ps_shader_create(struct radeon_device *rdev, struct radeon_atom *atom, return -ENOMEM; memcpy(ps_shader, data, sizeof(struct drm_r600_ps_shader)); atom->state = ps_shader; - r = radeon_atom_init(atom, &r600_ps_shader_emit); - if (r) - return r; /* SQ_PGM_START_PS */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000210; |