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

Commit 94f7bf64 authored by Tormod Volden's avatar Tormod Volden Committed by Dave Airlie
Browse files

drm/radeon: 9800 SE has only one quadpipe 

Although these cards have 2 pipelines on the silicon only
the first passed the QA and the other should be disabled.

http://www.digital-daily.com/video/ati-radeon9800se/
http://www.rojakpot.com/showarticle.aspx?artno=101&pgno=1



agd5f: add some other SE cards as well; fix up kms

Signed-off-by: default avatarTormod Volden <debian.tormod@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9c950a43

drivers/gpu/drm/radeon/r300.c

+2 −3
Original line number Diff line number Diff line
@@ -323,13 +323,12 @@ void r300_gpu_init(struct radeon_device *rdev) 
	uint32_t gb_tile_config, tmp;



	r100_hdp_reset(rdev);

	/* FIXME: rv380 one pipes ? */

	if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) ||

	    (rdev->family == CHIP_R350)) {

	    (rdev->family == CHIP_R350 && rdev->pdev->device != 0x4148)) {

		/* r300,r350 */

		rdev->num_gb_pipes = 2;

	} else {

		/* rv350,rv370,rv380,r300 AD */

		/* rv350,rv370,rv380,r300 AD, r350 AH */

		rdev->num_gb_pipes = 1;

	}

	rdev->num_z_pipes = 1;

drivers/gpu/drm/radeon/r420.c

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ void r420_pipes_init(struct radeon_device *rdev) 
	/* get max number of pipes */

	gb_pipe_select = RREG32(0x402C);

	num_pipes = ((gb_pipe_select >> 12) & 3) + 1;



	/* SE chips have 1 pipe */

	if ((rdev->pdev->device == 0x5e4c) ||

	    (rdev->pdev->device == 0x5e4f))

		num_pipes = 1;



	rdev->num_gb_pipes = num_pipes;

	tmp = 0;

	switch (num_pipes) {

drivers/gpu/drm/radeon/radeon_cp.c

+7 −2
Original line number Diff line number Diff line
@@ -435,14 +435,19 @@ static void radeon_init_pipes(struct drm_device *dev) 
	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) {

		gb_pipe_sel = RADEON_READ(R400_GB_PIPE_SELECT);

		dev_priv->num_gb_pipes = ((gb_pipe_sel >> 12) & 0x3) + 1;

		/* SE cards have 1 pipe */

		if ((dev->pdev->device == 0x5e4c) ||

		    (dev->pdev->device == 0x5e4f))

			dev_priv->num_gb_pipes = 1;

	} else {

		/* R3xx */

		if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300 &&

		     dev->pdev->device != 0x4144) ||

		    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350)) {

		    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350 &&

		     dev->pdev->device != 0x4148)) {

			dev_priv->num_gb_pipes = 2;

		} else {

			/* RV3xx/R300 AD */

			/* RV3xx/R300 AD/R350 AH */

			dev_priv->num_gb_pipes = 1;

		}

	}