Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfd8303a authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d2e546b8

drivers/gpu/drm/drm_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ void drm_vblank_put(struct drm_device *dev, int crtc) 
	if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&

	    (drm_vblank_offdelay > 0))

		mod_timer(&dev->vblank_disable_timer,

			  jiffies + ((drm_vblank_offdelay * DRM_HZ)/1000));

			  jiffies + ((drm_vblank_offdelay * HZ)/1000));

}

EXPORT_SYMBOL(drm_vblank_put);
@@ -1244,7 +1244,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, 
	DRM_DEBUG("waiting on vblank count %d, crtc %d\n",

		  vblwait->request.sequence, crtc);

	dev->vblank[crtc].last_wait = vblwait->request.sequence;

	DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * DRM_HZ,

	DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * HZ,

		    (((drm_vblank_count(dev, crtc) -

		       vblwait->request.sequence) <= (1 << 23)) ||

		     !dev->irq_enabled));

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static void mixer_wait_for_vblank(void *ctx) 
	 */

	if (!wait_event_timeout(mixer_ctx->wait_vsync_queue,

				!atomic_read(&mixer_ctx->wait_vsync_event),

				DRM_HZ/20))

				HZ/20))

		DRM_DEBUG_KMS("vblank wait timed out.\n");

}

drivers/gpu/drm/gma500/accel_2d.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ int psbfb_sync(struct fb_info *info) 
	struct psb_framebuffer *psbfb = &fbdev->pfb;

	struct drm_device *dev = psbfb->base.dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	unsigned long _end = jiffies + DRM_HZ;

	unsigned long _end = jiffies + HZ;

	int busy = 0;

	unsigned long flags;

drivers/gpu/drm/gma500/psb_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/gma500/psb_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int psb_vblank_do_wait(struct drm_device *dev, 
{

	unsigned int cur_vblank;

	int ret = 0;

	DRM_WAIT_ON(ret, dev->vblank.queue, 3 * DRM_HZ,

	DRM_WAIT_ON(ret, dev->vblank.queue, 3 * HZ,

		    (((cur_vblank = atomic_read(counter))

		      - *sequence) <= (1 << 23)));

	*sequence = cur_vblank;