Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 174063 | Differences between
and this patch

Collapse All | Expand All

(-)radeon_accel.c (-12 / +7 lines)
Lines 203-211 Link Here
203
	host_path_cntl = INREG(HOST_PATH_CNTL);
203
	host_path_cntl = INREG(HOST_PATH_CNTL);
204
	rbbm_soft_reset = INREG(RBBM_SOFT_RESET);
204
	rbbm_soft_reset = INREG(RBBM_SOFT_RESET);
205
205
206
	if (rinfo->family == CHIP_FAMILY_R300 ||
206
	if (IS_R300_VARIANT(rinfo)) {
207
	    rinfo->family == CHIP_FAMILY_R350 ||
208
	    rinfo->family == CHIP_FAMILY_RV350) {
209
		u32 tmp;
207
		u32 tmp;
210
208
211
		OUTREG(RBBM_SOFT_RESET, (rbbm_soft_reset |
209
		OUTREG(RBBM_SOFT_RESET, (rbbm_soft_reset |
Lines 241-249 Link Here
241
	INREG(HOST_PATH_CNTL);
239
	INREG(HOST_PATH_CNTL);
242
	OUTREG(HOST_PATH_CNTL, host_path_cntl);
240
	OUTREG(HOST_PATH_CNTL, host_path_cntl);
243
241
244
	if (rinfo->family != CHIP_FAMILY_R300 ||
242
	if (IS_R300_VARIANT(rinfo))
245
	    rinfo->family != CHIP_FAMILY_R350 ||
246
	    rinfo->family != CHIP_FAMILY_RV350)
247
		OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
243
		OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
248
244
249
	OUTREG(CLOCK_CNTL_INDEX, clock_cntl_index);
245
	OUTREG(CLOCK_CNTL_INDEX, clock_cntl_index);
Lines 254-269 Link Here
254
{
250
{
255
	unsigned long temp;
251
	unsigned long temp;
256
252
257
	/* disable 3D engine */
258
	OUTREG(RB3D_CNTL, 0);
259
260
	radeonfb_engine_reset(rinfo);
253
	radeonfb_engine_reset(rinfo);
261
254
262
	radeon_fifo_wait (1);
255
	radeon_fifo_wait (1);
263
	if ((rinfo->family != CHIP_FAMILY_R300) &&
256
	if (IS_R300_VARIANT(rinfo)) {
264
	    (rinfo->family != CHIP_FAMILY_R350) &&
257
		temp = INREG(RB2D_DSTCACHE_MODE);
265
	    (rinfo->family != CHIP_FAMILY_RV350))
258
		OUTREG(RB2D_DSTCACHE_MODE, temp | (1<<17)); /* FIXME */
259
	} else {
266
		OUTREG(RB2D_DSTCACHE_MODE, 0);
260
		OUTREG(RB2D_DSTCACHE_MODE, 0);
261
	}
267
262
268
	radeon_fifo_wait (3);
263
	radeon_fifo_wait (3);
269
	/* We re-read MC_FB_LOCATION from card as it can have been
264
	/* We re-read MC_FB_LOCATION from card as it can have been

Return to bug 174063