Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c6c7fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: add FireMV 2400 PCI ID.
  drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET
  drivers/gpu/radeon: Add MSPOS regs to safe list.
  drm/radeon/kms: disable the tv encoder when tv/cv is not in use
  drm/radeon/kms: adjust pll settings for tv
  drm/radeon/kms: fix tv dac conflict resolver
  drm/radeon/kms/evergreen: don't enable hdmi audio stuff
  drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0
  drm/radeon/kms: fix rs600 tlb flush
  drm/radeon/kms: print GPU family and device id when loading
  drm/radeon/kms: fix calculation of mipmapped 3D texture sizes
  drm/radeon/kms: only change mode when coherent value changes.
  drm/radeon/kms: more atom parser fixes (v2)
parents eb3e5cce 79b9517a

drivers/gpu/drm/radeon/atom.c

+10 −0
Original line number Diff line number Diff line
@@ -908,11 +908,16 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg) 
	uint8_t attr = U8((*ptr)++), shift;

	uint32_t saved, dst;

	int dptr = *ptr;

	uint32_t dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3];

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	/* op needs to full dst value */

	dst = saved;

	shift = atom_get_src(ctx, attr, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst <<= shift;

	dst &= atom_arg_mask[dst_align];

	dst >>= atom_arg_shift[dst_align];

	SDEBUG("   dst: ");

	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);

}
@@ -922,11 +927,16 @@ static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg) 
	uint8_t attr = U8((*ptr)++), shift;

	uint32_t saved, dst;

	int dptr = *ptr;

	uint32_t dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3];

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	/* op needs to full dst value */

	dst = saved;

	shift = atom_get_src(ctx, attr, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst >>= shift;

	dst &= atom_arg_mask[dst_align];

	dst >>= atom_arg_shift[dst_align];

	SDEBUG("   dst: ");

	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);

}

drivers/gpu/drm/radeon/atombios_crtc.c

+4 −0
Original line number Diff line number Diff line
@@ -521,6 +521,10 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
				/* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */

				if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1)

					adjusted_clock = mode->clock * 2;

				if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) {

					pll->algo = PLL_ALGO_LEGACY;

					pll->flags |= RADEON_PLL_PREFER_CLOSEST_LOWER;

				}

			} else {

				if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)

					pll->flags |= RADEON_PLL_NO_ODD_POST_DIV;

drivers/gpu/drm/radeon/r100.c

+15 −6
Original line number Diff line number Diff line
@@ -2891,7 +2891,7 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, 
{

	struct radeon_bo *robj;

	unsigned long size;

	unsigned u, i, w, h;

	unsigned u, i, w, h, d;

	int ret;



	for (u = 0; u < track->num_texture; u++) {
@@ -2923,20 +2923,25 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, 
			h = h / (1 << i);

			if (track->textures[u].roundup_h)

				h = roundup_pow_of_two(h);

			if (track->textures[u].tex_coord_type == 1) {

				d = (1 << track->textures[u].txdepth) / (1 << i);

				if (!d)

					d = 1;

			} else {

				d = 1;

			}

			if (track->textures[u].compress_format) {



				size += r100_track_compress_size(track->textures[u].compress_format, w, h);

				size += r100_track_compress_size(track->textures[u].compress_format, w, h) * d;

				/* compressed textures are block based */

			} else

				size += w * h;

				size += w * h * d;

		}

		size *= track->textures[u].cpp;



		switch (track->textures[u].tex_coord_type) {

		case 0:

			break;

		case 1:

			size *= (1 << track->textures[u].txdepth);

			break;

		case 2:

			if (track->separate_cube) {
@@ -3007,7 +3012,11 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 
		}

	}

	prim_walk = (track->vap_vf_cntl >> 4) & 0x3;

	if (track->vap_vf_cntl & (1 << 14)) {

		nverts = track->vap_alt_nverts;

	} else {

		nverts = (track->vap_vf_cntl >> 16) & 0xFFFF;

	}

	switch (prim_walk) {

	case 1:

		for (i = 0; i < track->num_arrays; i++) {

drivers/gpu/drm/radeon/r100_track.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct r100_cs_track { 
	unsigned			maxy;

	unsigned			vtx_size;

	unsigned			vap_vf_cntl;

	unsigned			vap_alt_nverts;

	unsigned			immd_dwords;

	unsigned			num_arrays;

	unsigned			max_indx;

drivers/gpu/drm/radeon/r300.c

+11 −4
Original line number Diff line number Diff line
@@ -730,6 +730,12 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		/* VAP_VF_MAX_VTX_INDX */

		track->max_indx = idx_value & 0x00FFFFFFUL;

		break;

	case 0x2088:

		/* VAP_ALT_NUM_VERTICES - only valid on r500 */

		if (p->rdev->family < CHIP_RV515)

			goto fail;

		track->vap_alt_nverts = idx_value & 0xFFFFFF;

		break;

	case 0x43E4:

		/* SC_SCISSOR1 */

		track->maxy = ((idx_value >> 13) & 0x1FFF) + 1;
@@ -767,7 +773,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		tmp = idx_value & ~(0x7 << 16);

		tmp |= tile_flags;

		ib[idx] = tmp;



		i = (reg - 0x4E38) >> 2;

		track->cb[i].pitch = idx_value & 0x3FFE;

		switch (((idx_value >> 21) & 0xF)) {
@@ -1052,12 +1057,14 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			break;

		/* fallthrough do not move */

	default:

		goto fail;

	}

	return 0;

fail:

	printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n",

	       reg, idx);

	return -EINVAL;

}

	return 0;

}



static int r300_packet3_check(struct radeon_cs_parser *p,

			      struct radeon_cs_packet *pkt)