Attachment 38477 Details for Bug 29810 – nv11_emac_kms_2.patch

[patch] nv11_emac_kms_2.patch

nv11_emac_kms_2.patch (text/plain), 2.46 KB, created by Francisco Jerez on 2010-09-06 08:23:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2010-09-06 08:23:08 UTC

Size: 2.46 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
>index ce3d98f..3afe39c 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
>@@ -6318,7 +6318,7 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
> 	/* this situation likely means a really old card, pre DCB */
> 	if (dcbptr == 0x0) {
> 		NV_INFO(dev, "Assuming a CRT output exists\n");
>-		fabricate_vga_output(dcb, LEGACY_I2C_CRT, 1);
>+		fabricate_vga_output(dcb, LEGACY_I2C_PANEL, 1);
> 
> 		if (nv04_tv_identify(dev, bios->legacy.i2c_indices.tv) >= 0)
> 			fabricate_tv_output(dcb, twoHeads);
>diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
>index 1f0f978..c08670c 100644
>--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
>+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
>@@ -134,7 +134,7 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
> 	state->pllsel &= PLLSEL_VPLL1_MASK | PLLSEL_VPLL2_MASK | PLLSEL_TV_MASK;
> 
> 	/* The blob uses this always, so let's do the same */
>-	if (dev_priv->card_type == NV_40)
>+	/* if (dev_priv->card_type == NV_40) */
> 		state->pllsel |= NV_PRAMDAC_PLL_COEFF_SELECT_USE_VPLL2_TRUE;
> 	/* again nv40 and some nv43 act more like nv3x as described above */
> 	if (dev_priv->chipset < 0x41)
>@@ -482,7 +482,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
> 
> 	/* What is the meaning of this register? */
> 	/* A few popular values are 0x18, 0x1c, 0x38, 0x3c */
>-	regp->CRTC[NV_CIO_CRE_ENH_INDEX] = savep->CRTC[NV_CIO_CRE_ENH_INDEX] & ~(1<<5);
>+	regp->CRTC[NV_CIO_CRE_ENH_INDEX] = savep->CRTC[NV_CIO_CRE_ENH_INDEX];
> 
> 	regp->crtc_eng_ctrl = 0;
> 	/* Except for rare conditions I2C is enabled on the primary crtc */
>@@ -545,8 +545,8 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
> 	if (dev_priv->card_type >= NV_30)
> 		regp->CRTC[0x9f] = off_chip_digital ? 0x11 : 0x1;
> 
>-	regp->crtc_830 = mode->crtc_vdisplay - 3;
>-	regp->crtc_834 = mode->crtc_vdisplay - 1;
>+	regp->crtc_830 = 0;
>+	regp->crtc_834 = 0;
> 
> 	if (dev_priv->card_type == NV_40)
> 		/* This is what the blob does */
>@@ -583,7 +583,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
> 		regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_PIPE_LONG;
> 
> 	regp->ramdac_630 = 0; /* turn off green mode (tv test pattern?) */
>-	regp->tv_setup = 0;
>+	regp->tv_setup = 1;
> 
> 	nv_crtc_set_image_sharpening(crtc, nv_crtc->sharpness);
>

Actions: View | Splinter Review

Attachments on bug 29810: 38169 | 38170 | 38171 | 38172 | 38176 | 38177 | 38178 | 38182 | 38194 | 38476 | 38477 | 38515 | 38526 | 38552 | 38563

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.