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

Commit cbee4751 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: fix r300 vram width calculations
  drm/radeon/kms: rs400/480 MC setup is different than r300.
  drm/radeon/kms: make initial state of load detect property correct.
  drm/radeon/kms: disable HDMI audio for now on rv710/rv730
  drm/radeon/kms: don't call suspend path before cleaning up GPU
  drivers/gpu/drm/radeon/radeon_combios.c: fix warning
  ati_pcigart: fix printk format warning
  drm/r100/kms: Emit cache flush to the end of command buffer. (v2)
  drm/radeon/kms: fix regression rendering issue on R6XX/R7XX
  drm/radeon/kms: move blit initialization after we disabled VGA
parents adbfbcd1 5ff55717

drivers/gpu/drm/ati_pcigart.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 


		if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) {

			DRM_ERROR("fail to set dma mask to 0x%Lx\n",

				  gart_info->table_mask);

				  (unsigned long long)gart_info->table_mask);

			ret = 1;

			goto done;

		}

drivers/gpu/drm/radeon/r100.c

+9 −5
Original line number Diff line number Diff line
@@ -354,11 +354,17 @@ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc) 
		return RREG32(RADEON_CRTC2_CRNT_FRAME);

}



/* Who ever call radeon_fence_emit should call ring_lock and ask

 * for enough space (today caller are ib schedule and buffer move) */

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) */

	/* We have to make sure that caches are flushed before

	 * CPU might read something from VRAM. */

	radeon_ring_write(rdev, PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));

	radeon_ring_write(rdev, RADEON_RB3D_DC_FLUSH_ALL);

	radeon_ring_write(rdev, PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));

	radeon_ring_write(rdev, RADEON_RB3D_ZC_FLUSH_ALL);

	/* Wait until IDLE & CLEAN */

	radeon_ring_write(rdev, PACKET0(0x1720, 0));

	radeon_ring_write(rdev, (1 << 16) | (1 << 17));
@@ -3369,7 +3375,6 @@ int r100_suspend(struct radeon_device *rdev) 


void r100_fini(struct radeon_device *rdev)

{

	r100_suspend(rdev);

	r100_cp_fini(rdev);

	r100_wb_fini(rdev);

	r100_ib_fini(rdev);
@@ -3481,13 +3486,12 @@ int r100_init(struct radeon_device *rdev) 
	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r100_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r300.c

+9 −7
Original line number Diff line number Diff line
@@ -506,11 +506,14 @@ void r300_vram_info(struct radeon_device *rdev) 


	/* DDR for all card after R300 & IGP */

	rdev->mc.vram_is_ddr = true;



	tmp = RREG32(RADEON_MEM_CNTL);

	if (tmp & R300_MEM_NUM_CHANNELS_MASK) {

		rdev->mc.vram_width = 128;

	} else {

		rdev->mc.vram_width = 64;

	tmp &= R300_MEM_NUM_CHANNELS_MASK;

	switch (tmp) {

	case 0: rdev->mc.vram_width = 64; break;

	case 1: rdev->mc.vram_width = 128; break;

	case 2: rdev->mc.vram_width = 256; break;

	default:  rdev->mc.vram_width = 128; break;

	}



	r100_vram_init_sizes(rdev);
@@ -1327,7 +1330,6 @@ int r300_suspend(struct radeon_device *rdev) 


void r300_fini(struct radeon_device *rdev)

{

	r300_suspend(rdev);

	r100_cp_fini(rdev);

	r100_wb_fini(rdev);

	r100_ib_fini(rdev);
@@ -1418,15 +1420,15 @@ int r300_init(struct radeon_device *rdev) 
	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r300_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_irq_kms_fini(rdev);

		radeon_agp_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r420.c

+1 −2
Original line number Diff line number Diff line
@@ -389,16 +389,15 @@ int r420_init(struct radeon_device *rdev) 
	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r420_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_agp_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r520.c

+1 −2
Original line number Diff line number Diff line
@@ -294,13 +294,12 @@ int r520_init(struct radeon_device *rdev) 
	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		rv515_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rv370_pcie_gart_fini(rdev);

		radeon_agp_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;