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

Commit d2af6768 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix gart setup on fusion parts (v2)
  drm: Send pending vblank events before disabling vblank.
  drm/radeon: fix regression on atom cards with hardcoded EDID record.
  drm/radeon/kms: add some new pci ids
parents cce2c56e 8aeb96f8

drivers/gpu/drm/drm_irq.c

+23 −0
Original line number Diff line number Diff line
@@ -932,11 +932,34 @@ EXPORT_SYMBOL(drm_vblank_put); 


void drm_vblank_off(struct drm_device *dev, int crtc)

{

	struct drm_pending_vblank_event *e, *t;

	struct timeval now;

	unsigned long irqflags;

	unsigned int seq;



	spin_lock_irqsave(&dev->vbl_lock, irqflags);

	vblank_disable_and_save(dev, crtc);

	DRM_WAKEUP(&dev->vbl_queue[crtc]);



	/* Send any queued vblank events, lest the natives grow disquiet */

	seq = drm_vblank_count_and_time(dev, crtc, &now);

	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {

		if (e->pipe != crtc)

			continue;

		DRM_DEBUG("Sending premature vblank event on disable: \

			  wanted %d, current %d\n",

			  e->event.sequence, seq);



		e->event.sequence = seq;

		e->event.tv_sec = now.tv_sec;

		e->event.tv_usec = now.tv_usec;

		drm_vblank_put(dev, e->pipe);

		list_move_tail(&e->base.link, &e->base.file_priv->event_list);

		wake_up_interruptible(&e->base.file_priv->event_wait);

		trace_drm_vblank_event_delivered(e->base.pid, e->pipe,

						 e->event.sequence);

	}



	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);

}

EXPORT_SYMBOL(drm_vblank_off);

drivers/gpu/drm/radeon/evergreen.c

+9 −8
Original line number Diff line number Diff line
@@ -862,9 +862,15 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev) 
		SYSTEM_ACCESS_MODE_NOT_IN_SYS |

		SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU |

		EFFECTIVE_L1_TLB_SIZE(5) | EFFECTIVE_L1_QUEUE_SIZE(5);

	if (rdev->flags & RADEON_IS_IGP) {

		WREG32(FUS_MC_VM_MD_L1_TLB0_CNTL, tmp);

		WREG32(FUS_MC_VM_MD_L1_TLB1_CNTL, tmp);

		WREG32(FUS_MC_VM_MD_L1_TLB2_CNTL, tmp);

	} else {

		WREG32(MC_VM_MD_L1_TLB0_CNTL, tmp);

		WREG32(MC_VM_MD_L1_TLB1_CNTL, tmp);

		WREG32(MC_VM_MD_L1_TLB2_CNTL, tmp);

	}

	WREG32(MC_VM_MB_L1_TLB0_CNTL, tmp);

	WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);

	WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
@@ -2923,11 +2929,6 @@ static int evergreen_startup(struct radeon_device *rdev) 
		rdev->asic->copy = NULL;

		dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);

	}

	/* XXX: ontario has problems blitting to gart at the moment */

	if (rdev->family == CHIP_PALM) {

		rdev->asic->copy = NULL;

		radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);

	}



	/* allocate wb buffer */

	r = radeon_wb_init(rdev);

drivers/gpu/drm/radeon/evergreend.h

+5 −0
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ 
#define	MC_VM_MD_L1_TLB0_CNTL				0x2654

#define	MC_VM_MD_L1_TLB1_CNTL				0x2658

#define	MC_VM_MD_L1_TLB2_CNTL				0x265C



#define	FUS_MC_VM_MD_L1_TLB0_CNTL			0x265C

#define	FUS_MC_VM_MD_L1_TLB1_CNTL			0x2660

#define	FUS_MC_VM_MD_L1_TLB2_CNTL			0x2664



#define	MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR		0x203C

#define	MC_VM_SYSTEM_APERTURE_HIGH_ADDR			0x2038

#define	MC_VM_SYSTEM_APERTURE_LOW_ADDR			0x2034

drivers/gpu/drm/radeon/radeon_atombios.c

+3 −2
Original line number Diff line number Diff line
@@ -1599,9 +1599,10 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct 
							memcpy((u8 *)edid, (u8 *)&fake_edid_record->ucFakeEDIDString[0],

							       fake_edid_record->ucFakeEDIDLength);



							if (drm_edid_is_valid(edid))

							if (drm_edid_is_valid(edid)) {

								rdev->mode_info.bios_hardcoded_edid = edid;

							else

								rdev->mode_info.bios_hardcoded_edid_size = edid_size;

							} else

								kfree(edid);

						}

					}

drivers/gpu/drm/radeon/radeon_kms.c

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			return -EINVAL;

		}

		break;

	case RADEON_INFO_FUSION_GART_WORKING:

		value = 1;

		break;

	default:

		DRM_DEBUG_KMS("Invalid request %d\n", info->request);

		return -EINVAL;