Commit 272725c7 authored Dec 14, 2016 by Ville Syrjälä

drm: Nuke fb->bits_per_pixel



Replace uses of fb->bits_per_pixel with fb->format->cpp[0]*8.
Less duplicated information is a good thing.

Note that I didn't put parens around the cpp*8 in the below cocci script,
on account of not wanting spurious parens all over the place. Instead I
did the unsafe way, and tried to look over the entire diff to spot if
any dangerous expressions were produced. I didn't see any.

There are some cases where previously the code did X*bpp/8, so the
division happened after the multiplication. Those are now just X*cpp
so the division effectively happens before the multiplication,
but that is perfectly fine since bpp is always a multiple of 8.

@@
struct drm_framebuffer *FB;
expression E;
@@
 drm_helper_mode_fill_fb_struct(...) {
	...
-	FB->bits_per_pixel = E;
	...
 }

@@
struct drm_framebuffer *FB;
expression E;
@@
 i9xx_get_initial_plane_config(...) {
	...
-	FB->bits_per_pixel = E;
	...
 }

@@
struct drm_framebuffer *FB;
expression E;
@@
 ironlake_get_initial_plane_config(...) {
	...
-	FB->bits_per_pixel = E;
	...
 }

@@
struct drm_framebuffer *FB;
expression E;
@@
 skylake_get_initial_plane_config(...) {
	...
-	FB->bits_per_pixel = E;
	...
 }

@@
struct drm_framebuffer FB;
expression E;
@@
(
- E * FB.bits_per_pixel / 8
+ E * FB.format->cpp[0]
|
- FB.bits_per_pixel / 8
+ FB.format->cpp[0]
|
- E * FB.bits_per_pixel >> 3
+ E * FB.format->cpp[0]
|
- FB.bits_per_pixel >> 3
+ FB.format->cpp[0]
|
- (FB.bits_per_pixel + 7) / 8
+ FB.format->cpp[0]
|
- FB.bits_per_pixel
+ FB.format->cpp[0] * 8
|
- FB.format->cpp[0] * 8 != 8
+ FB.format->cpp[0] != 1
)

@@
struct drm_framebuffer *FB;
expression E;
@@
(
- E * FB->bits_per_pixel / 8
+ E * FB->format->cpp[0]
|
- FB->bits_per_pixel / 8
+ FB->format->cpp[0]
|
- E * FB->bits_per_pixel >> 3
+ E * FB->format->cpp[0]
|
- FB->bits_per_pixel >> 3
+ FB->format->cpp[0]
|
- (FB->bits_per_pixel + 7) / 8
+ FB->format->cpp[0]
|
- FB->bits_per_pixel
+ FB->format->cpp[0] * 8
|
- FB->format->cpp[0] * 8 != 8
+ FB->format->cpp[0] != 1
)

@@
struct drm_plane_state *state;
expression E;
@@
(
- E * state->fb->bits_per_pixel / 8
+ E * state->fb->format->cpp[0]
|
- state->fb->bits_per_pixel / 8
+ state->fb->format->cpp[0]
|
- E * state->fb->bits_per_pixel >> 3
+ E * state->fb->format->cpp[0]
|
- state->fb->bits_per_pixel >> 3
+ state->fb->format->cpp[0]
|
- (state->fb->bits_per_pixel + 7) / 8
+ state->fb->format->cpp[0]
|
- state->fb->bits_per_pixel
+ state->fb->format->cpp[0] * 8
|
- state->fb->format->cpp[0] * 8 != 8
+ state->fb->format->cpp[0] != 1
)

@@
@@
- (8 * 8)
+ 8 * 8

@@
struct drm_framebuffer FB;
@@
- (FB.format->cpp[0])
+ FB.format->cpp[0]

@@
struct drm_framebuffer *FB;
@@
- (FB->format->cpp[0])
+ FB->format->cpp[0]

@@
@@
 struct drm_framebuffer {
	 ...
-	 int bits_per_pixel;
	 ...
 };

v2: Clean up the 'cpp*8 != 8' and '(8 * 8)' cases (Laurent)
v3: Adjusted the semantic patch a bit and regenerated due to code
    changes

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Link: http://patchwork.freedesktop.org/patch/msgid/1481751140-18352-1-git-send-email-ville.syrjala@linux.intel.com

parent b00c600e

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2220,7 +2220,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc,
		WREG32(mmGRPH_X_END + amdgpu_crtc->crtc_offset, target_fb->width);
		WREG32(mmGRPH_Y_END + amdgpu_crtc->crtc_offset, target_fb->height);

		fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
		fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
		WREG32(mmGRPH_PITCH + amdgpu_crtc->crtc_offset, fb_pitch_pixels);

		dce_v10_0_grph_enable(crtc, true);

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2201,7 +2201,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
		WREG32(mmGRPH_X_END + amdgpu_crtc->crtc_offset, target_fb->width);
		WREG32(mmGRPH_Y_END + amdgpu_crtc->crtc_offset, target_fb->height);

		fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
		fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
		WREG32(mmGRPH_PITCH + amdgpu_crtc->crtc_offset, fb_pitch_pixels);

		dce_v11_0_grph_enable(crtc, true);

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1630,7 +1630,7 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc,
		WREG32(mmGRPH_X_END + amdgpu_crtc->crtc_offset, target_fb->width);
		WREG32(mmGRPH_Y_END + amdgpu_crtc->crtc_offset, target_fb->height);

		fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
		fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
		WREG32(mmGRPH_PITCH + amdgpu_crtc->crtc_offset, fb_pitch_pixels);

		dce_v6_0_grph_enable(crtc, true);

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2079,7 +2079,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,
		WREG32(mmGRPH_X_END + amdgpu_crtc->crtc_offset, target_fb->width);
		WREG32(mmGRPH_Y_END + amdgpu_crtc->crtc_offset, target_fb->height);

		fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
		fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
		WREG32(mmGRPH_PITCH + amdgpu_crtc->crtc_offset, fb_pitch_pixels);

		dce_v8_0_grph_enable(crtc, true);

drivers/gpu/drm/armada/armada_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ static unsigned armada_drm_crtc_calc_fb(struct drm_framebuffer *fb,
		unsigned i = 0;

		DRM_DEBUG_DRIVER("pitch %u x %d y %d bpp %d\n",
		pitch, x, y, fb->bits_per_pixel);
		pitch, x, y, fb->format->cpp[0] * 8);

		armada_drm_plane_calc_addrs(addrs, fb, x, y);