summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/psb_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter2013-12-11 11:34:41 +0100
committerDave Airlie2013-12-18 02:33:24 +0100
commitbfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3 (patch)
treecf305ff6c73fb4ff2383ba119e5c5285cbaa79a4 /drivers/gpu/drm/gma500/psb_drv.h
parentdrm: rip out DRM_AGP_MEM and DRM_AGP_KERN (diff)
downloadkernel-qcow2-linux-bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3.tar.gz
kernel-qcow2-linux-bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3.tar.xz
kernel-qcow2-linux-bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3.zip
drm: Kill DRM_HZ
We don't have any userspace interfaces that use HZ as a time unit, so having our own DRM define is useless. Remove this remnant from the shared drm core days. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.h')
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index b59e6588c343..8d2a395edbd2 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -212,8 +212,8 @@ enum {
#define PSB_HIGH_REG_OFFS 0x0600
#define PSB_NUM_VBLANKS 2
-#define PSB_WATCHDOG_DELAY (DRM_HZ * 2)
-#define PSB_LID_DELAY (DRM_HZ / 10)
+#define PSB_WATCHDOG_DELAY (HZ * 2)
+#define PSB_LID_DELAY (HZ / 10)
#define MDFLD_PNW_B0 0x04
#define MDFLD_PNW_C0 0x08
@@ -232,7 +232,7 @@ enum {
#define MDFLD_DSR_RR 45
#define MDFLD_DPU_ENABLE (1 << 31)
#define MDFLD_DSR_FULLSCREEN (1 << 30)
-#define MDFLD_DSR_DELAY (DRM_HZ / MDFLD_DSR_RR)
+#define MDFLD_DSR_DELAY (HZ / MDFLD_DSR_RR)
#define PSB_PWR_STATE_ON 1
#define PSB_PWR_STATE_OFF 2