diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-03-08 16:02:20 +0000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-10 13:05:48 +0000 |
commit | 026abc333205c1fff80138b8c2cac3d0347685f4 (patch) | |
tree | dbcb2ad763f96b5f0c99ec5650f477aa103a8528 /drivers/gpu/drm/gma500/psb_irq.h | |
parent | c6265ff593467d472814aa9f16f89f6c1dc90a5d (diff) | |
download | linux-026abc333205c1fff80138b8c2cac3d0347685f4.tar.gz linux-026abc333205c1fff80138b8c2cac3d0347685f4.tar.bz2 linux-026abc333205c1fff80138b8c2cac3d0347685f4.zip |
gma500: initial medfield merge
We need to merge this ahead of some of the cleanup because a lot of needed
cleanup spans both new and old chips. If we try and clean up and the merge
we end up fighting ourselves.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
[With a load of the cleanup stuff folded in, register stuff reworked sanely]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_irq.h')
-rw-r--r-- | drivers/gpu/drm/gma500/psb_irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h index 216fda38b57d..603045bee58a 100644 --- a/drivers/gpu/drm/gma500/psb_irq.h +++ b/drivers/gpu/drm/gma500/psb_irq.h @@ -42,4 +42,6 @@ int psb_enable_vblank(struct drm_device *dev, int pipe); void psb_disable_vblank(struct drm_device *dev, int pipe); u32 psb_get_vblank_counter(struct drm_device *dev, int pipe); +int mdfld_enable_te(struct drm_device *dev, int pipe); +void mdfld_disable_te(struct drm_device *dev, int pipe); #endif /* _SYSIRQ_H_ */ |