summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDavid Airlie <airlied@asimov.stargames.com.au>2007-04-11 13:18:49 +1000
committerDave Airlie <airlied@airlied2.(none)>2007-04-11 13:26:21 +1000
commit3e994a56be1bfc633e49434c9e4a3e3262070248 (patch)
tree743030157d0836d6bf11abbabdddf132fc402ab3 /linux-core
parentf50eec752c8754595ba99f0ec7a7c8138316a819 (diff)
use fb pitch and fix up some whitespace
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/intel_display.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/linux-core/intel_display.c b/linux-core/intel_display.c
index 1eed71f0..04a6e086 100644
--- a/linux-core/intel_display.c
+++ b/linux-core/intel_display.c
@@ -350,7 +350,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y)
int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
Start = crtc->fb->offset + dev_priv->baseaddr;
- Offset = ((y * crtc->fb->width + x) * (crtc->fb->bits_per_pixel / 8));
+ Offset = ((y * crtc->fb->pitch + x) * (crtc->fb->bits_per_pixel / 8));
DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
if (IS_I965G(dev)) {
@@ -530,24 +530,22 @@ static void intel_crtc_unlock (struct drm_crtc *crtc)
static void intel_crtc_prepare (struct drm_crtc *crtc)
{
- crtc->funcs->dpms (crtc, DPMSModeOff);
+ crtc->funcs->dpms(crtc, DPMSModeOff);
}
static void intel_crtc_commit (struct drm_crtc *crtc)
{
- crtc->funcs->dpms (crtc, DPMSModeOn);
-// if (crtc->scrn->pScreen != NULL)
-// xf86_reload_cursors (crtc->scrn->pScreen);
+ crtc->funcs->dpms(crtc, DPMSModeOn);
}
void intel_output_prepare (struct drm_output *output)
{
- output->funcs->dpms (output, DPMSModeOff);
+ output->funcs->dpms(output, DPMSModeOff);
}
void intel_output_commit (struct drm_output *output)
{
- output->funcs->dpms (output, DPMSModeOn);
+ output->funcs->dpms(output, DPMSModeOn);
}
static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,