WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/r100.c

 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
 		struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 		switch (radeon_connector->hpd.hpd) {
 		case RADEON_HPD_1:
-			rdev->irq.hpd[0] = true;
+//           rdev->irq.hpd[0] = true;
 			break;
 		case RADEON_HPD_2:
-			rdev->irq.hpd[1] = true;
+//           rdev->irq.hpd[1] = true;
 			break;
 		default:
 			break;
+		}
+	}
-	}
+//   if (rdev->irq.installed)
-	r100_irq_set(rdev);
+//   r100_irq_set(rdev);
+}
 void r100_hpd_fini(struct radeon_device *rdev)
 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
 		struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 		switch (radeon_connector->hpd.hpd) {
 		case RADEON_HPD_1:
-			rdev->irq.hpd[0] = false;
+//           rdev->irq.hpd[0] = false;
 			break;
 		case RADEON_HPD_2:
-			rdev->irq.hpd[1] = false;
+//           rdev->irq.hpd[1] = false;
 			break;
 		default:
 			break;
+		}
+	}
 	return irqs & irq_mask;
+}
+u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc)
+{
+	if (crtc == 0)
+		return RREG32(RADEON_CRTC_CRNT_FRAME);
+	else
 		return RREG32(RADEON_CRTC2_CRNT_FRAME);
+}
 void r100_fence_ring_emit(struct radeon_device *rdev,
 			  struct radeon_fence *fence)
+{
 	/* Who ever call radeon_fence_emit should call ring_lock and ask
 	 * for enough space (today caller are ib schedule and buffer move) */
+	/* Wait until IDLE & CLEAN */
+	radeon_ring_write(rdev, PACKET0(0x1720, 0));
+	radeon_ring_write(rdev, (1 << 16) | (1 << 17));
+	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
+	radeon_ring_write(rdev, rdev->config.r100.hdp_cntl |
-	/* Wait until IDLE & CLEAN */
+				RADEON_HDP_READ_BUFFER_INVALIDATE);
-	radeon_ring_write(rdev, PACKET0(0x1720, 0));
+	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
-	radeon_ring_write(rdev, (1 << 16) | (1 << 17));
+	radeon_ring_write(rdev, rdev->config.r100.hdp_cntl);
 	/* Emit fence sequence & fire IRQ */
 	radeon_ring_write(rdev, PACKET0(rdev->fence_drv.scratch_reg, 0));
 		rdev->me_fw = NULL;
+	}
 	return err;
+}
-static inline __u32 __swab32(__u32 x)
-{
-         asm("bswapl %0" :
-         "=&r" (x)
-         :"r" (x));
-         return x;
-}
-static inline __u32 be32_to_cpup(const __be32 *p)
-{
-         return __swab32(*(__u32 *)p);
-}
 static void r100_cp_load_microcode(struct radeon_device *rdev)
+{
 		case RADEON_TXFORMAT_ARGB1555:
 		case RADEON_TXFORMAT_RGB565:
 		case RADEON_TXFORMAT_ARGB4444:
 		case RADEON_TXFORMAT_VYUY422:
 		case RADEON_TXFORMAT_YVYU422:
-		case RADEON_TXFORMAT_DXT1:
 		case RADEON_TXFORMAT_SHADOW16:
 		case RADEON_TXFORMAT_LDUDV655:
 		case RADEON_TXFORMAT_DUDV88:
 			track->textures[i].cpp = 2;
 			break;
 		case RADEON_TXFORMAT_ARGB8888:
 		case RADEON_TXFORMAT_RGBA8888:
-		case RADEON_TXFORMAT_DXT23:
-		case RADEON_TXFORMAT_DXT45:
 		case RADEON_TXFORMAT_SHADOW32:
 		case RADEON_TXFORMAT_LDUDUV8888:
 			track->textures[i].cpp = 4;
 			break;
+		case RADEON_TXFORMAT_DXT1:
+			track->textures[i].cpp = 1;
+			track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+			break;
+		case RADEON_TXFORMAT_DXT23:
+		case RADEON_TXFORMAT_DXT45:
+			track->textures[i].cpp = 1;
+			track->textures[i].compress_format = R100_TRACK_COMP_DXT35;
+			break;
+		}
 		track->textures[i].cube_info[4].width = 1 << ((idx_value >> 16) & 0xf);
 		track->textures[i].cube_info[4].height = 1 << ((idx_value >> 20) & 0xf);
 		break;
 	case RADEON_PP_CUBIC_FACES_0:
 	case PACKET3_3D_DRAW_IMMD:
 		if (((radeon_get_ib_value(p, idx + 1) >> 4) & 0x3) != 3) {
 			DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");
 			return -EINVAL;
+		}
+		track->vtx_size = r100_get_vtx_size(radeon_get_ib_value(p, idx + 0));
 		track->vap_vf_cntl = radeon_get_ib_value(p, idx + 1);
 		track->immd_dwords = pkt->count - 1;
 		r = r100_cs_track_check(p->rdev, track);
 		if (r)
 			return r;
+{
 	/* TODO: anythings to do here ? pipes ? */
 	r100_hdp_reset(rdev);
+}
-void r100_hdp_flush(struct radeon_device *rdev)
-{
-	u32 tmp;
-	tmp = RREG32(RADEON_HOST_PATH_CNTL);
-	tmp |= RADEON_HDP_READ_BUFFER_INVALIDATE;
-	WREG32(RADEON_HOST_PATH_CNTL, tmp);
-}
 void r100_hdp_reset(struct radeon_device *rdev)
+{
 	uint32_t tmp;
 		rdev->mc.vram_location = tmp << 16;
+	}
 	if (rdev->flags & RADEON_IS_AGP) {
 		r = radeon_agp_init(rdev);
 		if (r) {
-			printk(KERN_WARNING "[drm] Disabling AGP\n");
-			rdev->flags &= ~RADEON_IS_AGP;
+			radeon_agp_disable(rdev);
-			rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
 		} else {
 			rdev->mc.gtt_location = rdev->mc.agp_base;
+		}
+	}
 	r = radeon_mc_setup(rdev);
 		return -EINVAL;
 	/* Set asic errata */
 	r100_errata(rdev);
 	/* Initialize clocks */
 	radeon_get_clock_info(rdev->ddev);
+	/* Initialize power management */
+	radeon_pm_init(rdev);
 	/* Get vram informations */
 	r100_vram_info(rdev);
 	/* Initialize memory controller (also test AGP) */
 	r = r100_mc_init(rdev);
     dbgprintf("mc vram location %x\n", rdev->mc.vram_location);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/r100.c – Rev 1321 → 1403