Skip to content

Commit

Permalink
gma500: opregion and ACPI
Browse files Browse the repository at this point in the history
Add the opregion support and bring us in line with the opregion functionality in the
reference driver code. We can't share this with i915 currently because there are
hardcoded assumptions about dev_priv etc in both versions.

[airlied: include opregion.h fix]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Alan Cox authored and Dave Airlie committed May 7, 2012
1 parent 9aba9d3 commit d839ede
Show file tree
Hide file tree
Showing 11 changed files with 396 additions and 188 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/gma500/cdv_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
178 changes: 0 additions & 178 deletions drivers/gpu/drm/gma500/intel_opregion.c

This file was deleted.

2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/oaktrail_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit d839ede

Please sign in to comment.