summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-03-21 00:00:56 -0700
committerEric Anholt <eric@anholt.net>2007-03-21 00:01:08 -0700
commit02023998663cc7f0735fadfb1719d93dc2e5a112 (patch)
tree1eaf25138315bc1267a7eaf000b6327c8235d29f
parent3e9ec78b4f54defb9986e11e6f2ac3475755849d (diff)
Whitespace and symbolic reg names cleanup in i830_panel_fitter_pipe().
-rw-r--r--src/i830_display.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/i830_display.c b/src/i830_display.c
index 5cedd778..0d0cdf0f 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -673,23 +673,23 @@ i830_get_core_clock_speed(ScrnInfoPtr pScrn)
* or -1 if the panel fitter is not present or not in use
*/
static int
-i830_panel_fitter_pipe (I830Ptr pI830)
+i830_panel_fitter_pipe(I830Ptr pI830)
{
CARD32 pfit_control;
-
+
/* i830 doesn't have a panel fitter */
if (IS_I830(pI830))
return -1;
-
+
pfit_control = INREG(PFIT_CONTROL);
-
+
/* See if the panel fitter is in use */
if ((pfit_control & PFIT_ENABLE) == 0)
return -1;
-
+
/* 965 can place panel fitter on either pipe */
if (IS_I965G(pI830))
- return (pfit_control >> 29) & 0x3;
+ return (pfit_control & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT;
/* older chips can only use pipe 1 */
return 1;