On Fri, Nov 18, 2016 at 09:52:43PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Add a local 'fb' variable to a few places to get rid of the > 'crtc->primary->fb' stuff. Looks neater and helps me with my poor > coccinelle skills later. > > Cc: Dave Airlie <airlied@xxxxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > --- > drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c > index 17c915d9a03e..f2297acae235 100644 > --- a/drivers/gpu/drm/cirrus/cirrus_mode.c > +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c > @@ -185,6 +185,7 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc, > { > struct drm_device *dev = crtc->dev; > struct cirrus_device *cdev = dev->dev_private; > + const struct drm_framebuffer *fb = crtc->primary->fb; > int hsyncstart, hsyncend, htotal, hdispend; > int vtotal, vdispend; > int tmp; > @@ -257,7 +258,7 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc, > sr07 = RREG8(SEQ_DATA); > sr07 &= 0xe0; > hdr = 0; > - switch (crtc->primary->fb->bits_per_pixel) { > + switch (fb->bits_per_pixel) { > case 8: > sr07 |= 0x11; > break; > @@ -280,13 +281,13 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc, > WREG_SEQ(0x7, sr07); > > /* Program the pitch */ > - tmp = crtc->primary->fb->pitches[0] / 8; > + tmp = fb->pitches[0] / 8; > WREG_CRT(VGA_CRTC_OFFSET, tmp); > > /* Enable extended blanking and pitch bits, and enable full memory */ > tmp = 0x22; > - tmp |= (crtc->primary->fb->pitches[0] >> 7) & 0x10; > - tmp |= (crtc->primary->fb->pitches[0] >> 6) & 0x40; > + tmp |= (fb->pitches[0] >> 7) & 0x10; > + tmp |= (fb->pitches[0] >> 6) & 0x40; > WREG_CRT(0x1b, tmp); > > /* Enable high-colour modes */ > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel