---

yaml --- r: 307235 b: refs/heads/master c: d839ede h: refs/heads/master i: 307233: 702e7c3 307231: cc75f72 v: v3
git-mirror · May 7, 2012 · cfa31f6 · cfa31f6
1 parent 7854229
commit cfa31f6
Show file tree

Hide file tree

Showing 12 changed files with 397 additions and 189 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aba9d3a2ca42572c9c196e8be6cab59b7c078b6
+refs/heads/master: d839ede47a56ff5f316c88391818488f8e5913af
diff --git a/trunk/drivers/gpu/drm/gma500/Makefile b/trunk/drivers/gpu/drm/gma500/Makefile
@@ -12,8 +12,8 @@ gma500_gfx-y += gem_glue.o \
 	  intel_bios.o \
 	  intel_i2c.o \
 	  intel_gmbus.o \
-	  intel_opregion.o \
 	  mmu.o \
+	  opregion.o \
 	  power.o \
 	  psb_drv.o \
 	  psb_intel_display.o \

diff --git a/trunk/drivers/gpu/drm/gma500/cdv_device.c b/trunk/drivers/gpu/drm/gma500/cdv_device.c
@@ -157,7 +157,7 @@ static int cdv_backlight_init(struct drm_device *dev)
 
 	cdv_backlight_device->props.brightness =
 			cdv_get_brightness(cdv_backlight_device);
-	cdv_backlight_device->props.max_brightness = cdv_get_max_brightness;
+	cdv_backlight_device->props.max_brightness = cdv_get_max_backlight(dev);
 	backlight_update_status(cdv_backlight_device);
 	dev_priv->backlight_device = cdv_backlight_device;
 	return 0;
@@ -490,7 +490,7 @@ static int cdv_chip_setup(struct drm_device *dev)
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);
 	cdv_get_core_freq(dev);
-	gma_intel_opregion_init(dev);
+	psb_intel_opregion_init(dev);
 	psb_intel_init_bios(dev);
 	cdv_hotplug_enable(dev, false);
 	return 0;

diff --git a/trunk/drivers/gpu/drm/gma500/intel_opregion.c b/trunk/drivers/gpu/drm/gma500/intel_opregion.c
diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_device.c b/trunk/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -466,7 +466,7 @@ static int oaktrail_chip_setup(struct drm_device *dev)
 		return ret;
 	if (vbt->size == 0) {
 		/* Now pull the BIOS data */
-		gma_intel_opregion_init(dev);
+		psb_intel_opregion_init(dev);
 		psb_intel_init_bios(dev);
 	}
 	oaktrail_hdmi_setup(dev);