Attachment 38013 Details for Bug 29685 – nouveau_imac_backlight.patch

[patch] nouveau_imac_backlight.patch

nouveau_imac_backlight.patch (text/plain), 2.82 KB, created by Francisco Jerez on 2010-08-20 05:35:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2010-08-20 05:35:50 UTC

Size: 2.82 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
>index 90aa1a9..13fc8ee 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
>@@ -3869,27 +3869,10 @@ static int call_lvds_manufacturer_script(struct drm_device *dev, struct dcb_entr
> 	}
> #ifdef __powerpc__
> 	/* Powerbook specific quirks */
>-	if ((dev->pci_device & 0xffff) == 0x0179 ||
>-	    (dev->pci_device & 0xffff) == 0x0189 ||
>-	    (dev->pci_device & 0xffff) == 0x0329) {
>-		if (script == LVDS_RESET) {
>-			nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
>-
>-		} else if (script == LVDS_PANEL_ON) {
>-			bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,
>-				  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)
>-				  | (1 << 31));
>-			bios_wr32(bios, NV_PCRTC_GPIO_EXT,
>-				  bios_rd32(bios, NV_PCRTC_GPIO_EXT) | 1);
>-
>-		} else if (script == LVDS_PANEL_OFF) {
>-			bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,
>-				  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)
>-				  & ~(1 << 31));
>-			bios_wr32(bios, NV_PCRTC_GPIO_EXT,
>-				  bios_rd32(bios, NV_PCRTC_GPIO_EXT) & ~3);
>-		}
>-	}
>+	if (script == LVDS_RESET &&
>+	    (dev->pci_device == 0x0179 || dev->pci_device == 0x0189 ||
>+	     dev->pci_device == 0x0329))
>+		nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
> #endif
> 
> 	return 0;
>diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c
>index ea89f6e..1abf019 100644
>--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
>+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
>@@ -475,6 +475,27 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
> 		nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> }
> 
>+static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode)
>+{
>+#ifdef __powerpc__
>+	struct drm_device *dev = encoder->dev;
>+
>+	/* BIOS scripts are supposed to take care of the backlight,
>+	 * thanks Apple for your consistency.
>+	 */
>+	if (dev->pci_device == 0x0179 || dev->pci_device == 0x0189 ||
>+	    dev->pci_device == 0x0329) {
>+		if (mode == DRM_MODE_DPMS_ON) {
>+			nv_mask(dev, NV_PBUS_DEBUG_DUALHEAD_CTL, 0, 1 << 31);
>+			nv_mask(dev, NV_PCRTC_GPIO_EXT, 3, 1);
>+		} else {
>+			nv_mask(dev, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 0);
>+			nv_mask(dev, NV_PCRTC_GPIO_EXT, 3, 0);
>+		}
>+	}
>+#endif
>+}
>+
> static inline bool is_powersaving_dpms(int mode)
> {
> 	return (mode != DRM_MODE_DPMS_ON);
>@@ -522,6 +543,7 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode)
> 					 LVDS_PANEL_OFF, 0);
> 	}
> 
>+	nv04_dfp_update_backlight(encoder, mode);
> 	nv04_dfp_update_fp_control(encoder, mode);
> 
> 	if (mode == DRM_MODE_DPMS_ON)
>@@ -545,6 +567,7 @@ static void nv04_tmds_dpms(struct drm_encoder *encoder, int mode)
> 	NV_INFO(dev, "Setting dpms mode %d on tmds encoder (output %d)\n",
> 		     mode, nv_encoder->dcb->index);
> 
>+	nv04_dfp_update_backlight(encoder, mode);
> 	nv04_dfp_update_fp_control(encoder, mode);
> }
>

Actions: View | Splinter Review

Attachments on bug 29685: 38013

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.