openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/mgag200: Convert counter delays to jiffies 

Signed-off-by: Christopher Harvey <charvey@matrox.com>
Acked-by: Julia Lemire <jlemire@matrox.com>
Tested-by: Julia Lemire <jlemire@matrox.com>
Acked-by: Mathieu Larouche <mathieu.larouche@matrox.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Christopher Harvey 2013-05-06 15:56:17 +00:00 committed by Dave Airlie
parent fb70a66908
commit 3cdc0e8d61
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/mgag200/mgag200_mode.c
View File

@ -46,29 +46,26 @@ static void mga_crtc_load_lut(struct drm_crtc *crtc)
static inline void mga_wait_vsync(struct mga_device *mdev) static inline void mga_wait_vsync(struct mga_device *mdev)
{ {
unsigned int count = 0; unsigned long timeout = jiffies + HZ/10;
unsigned int status = 0; unsigned int status = 0;
do { do {
status = RREG32(MGAREG_Status); status = RREG32(MGAREG_Status);
count++; } while ((status & 0x08) && time_before(jiffies, timeout));
} while ((status & 0x08) && (count < 250000)); timeout = jiffies + HZ/10;
count = 0;
status = 0; status = 0;
do { do {
status = RREG32(MGAREG_Status); status = RREG32(MGAREG_Status);
count++; } while (!(status & 0x08) && time_before(jiffies, timeout));
} while (!(status & 0x08) && (count < 250000));
} }
static inline void mga_wait_busy(struct mga_device *mdev) static inline void mga_wait_busy(struct mga_device *mdev)
{ {
unsigned int count = 0; unsigned long timeout = jiffies + HZ;
unsigned int status = 0; unsigned int status = 0;
do { do {
status = RREG8(MGAREG_Status + 2); status = RREG8(MGAREG_Status + 2);
count++; } while ((status & 0x01) && time_before(jiffies, timeout));
} while ((status & 0x01) && (count < 500000));
} }
/* /*