On Fri, Nov 18, 2016 at 09:52:40PM +0200, ville.syrjala at linux.intel.com
wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> 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 at redhat.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c
> b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index 6b21cb27e1cc..bdac288ab16d 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -880,6 +880,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> {
> struct drm_device *dev = crtc->dev;
> struct mga_device *mdev = dev->dev_private;
> + const struct drm_framebuffer *fb = crtc->primary->fb;
> int hdisplay, hsyncstart, hsyncend, htotal;
> int vdisplay, vsyncstart, vsyncend, vtotal;
> int pitch;
> @@ -902,7 +903,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> /* 0x48: */ 0, 0, 0, 0, 0, 0, 0, 0
> };
>
> - bppshift = mdev->bpp_shifts[(crtc->primary->fb->bits_per_pixel >> 3) -
> 1];
> + bppshift = mdev->bpp_shifts[(fb->bits_per_pixel >> 3) - 1];
>
> switch (mdev->type) {
> case G200_SE_A:
> @@ -941,12 +942,12 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> break;
> }
>
> - switch (crtc->primary->fb->bits_per_pixel) {
> + switch (fb->bits_per_pixel) {
> case 8:
> dacvalue[MGA1064_MUL_CTL] = MGA1064_MUL_CTL_8bits;
> break;
> case 16:
> - if (crtc->primary->fb->depth == 15)
> + if (fb->depth == 15)
> dacvalue[MGA1064_MUL_CTL] = MGA1064_MUL_CTL_15bits;
> else
> dacvalue[MGA1064_MUL_CTL] = MGA1064_MUL_CTL_16bits;
> @@ -997,8 +998,8 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> WREG_SEQ(3, 0);
> WREG_SEQ(4, 0xe);
>
> - pitch = crtc->primary->fb->pitches[0] /
> (crtc->primary->fb->bits_per_pixel / 8);
> - if (crtc->primary->fb->bits_per_pixel == 24)
> + pitch = fb->pitches[0] / (fb->bits_per_pixel / 8);
> + if (fb->bits_per_pixel == 24)
> pitch = (pitch * 3) >> (4 - bppshift);
> else
> pitch = pitch >> (4 - bppshift);
> @@ -1075,7 +1076,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> ((vdisplay & 0xc00) >> 7) |
> ((vsyncstart & 0xc00) >> 5) |
> ((vdisplay & 0x400) >> 3);
> - if (crtc->primary->fb->bits_per_pixel == 24)
> + if (fb->bits_per_pixel == 24)
> ext_vga[3] = (((1 << bppshift) * 3) - 1) | 0x80;
> else
> ext_vga[3] = ((1 << bppshift) - 1) | 0x80;
> @@ -1138,9 +1139,9 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
> u32 bpp;
> u32 mb;
>
> - if (crtc->primary->fb->bits_per_pixel > 16)
> + if (fb->bits_per_pixel > 16)
> bpp = 32;
> - else if (crtc->primary->fb->bits_per_pixel > 8)
> + else if (fb->bits_per_pixel > 8)
> bpp = 16;
> else
> bpp = 8;
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
