Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438b74a5 authored Dec 14, 2016 by Ville Syrjälä

drm: Nuke fb->pixel_format



Replace uses of fb->pixel_format with fb->format->format.
Less duplicated information is a good thing.

Note that coccinelle failed to eliminate the
"/* fourcc format */" comment from drm_framebuffer.h, so I had
to do that part manually.

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

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

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

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

@@
struct drm_framebuffer *a;
struct drm_framebuffer b;
@@
(
- a->pixel_format
+ a->format->format
|
- b.pixel_format
+ b.format->format
)

@@
struct drm_plane_state *a;
struct drm_plane_state b;
@@
(
- a->fb->pixel_format
+ a->fb->format->format
|
- b.fb->pixel_format
+ b.fb->format->format
)

@@
struct drm_crtc *CRTC;
@@
(
- CRTC->primary->fb->pixel_format
+ CRTC->primary->fb->format->format
|
- CRTC->primary->state->fb->pixel_format
+ CRTC->primary->state->fb->format->format
)

@@
struct drm_mode_set *set;
@@
(
- set->fb->pixel_format
+ set->fb->format->format
|
- set->crtc->primary->fb->pixel_format
+ set->crtc->primary->fb->format->format
)

@@
@@
 struct drm_framebuffer {
	 ...
-	 uint32_t pixel_format;
	 ...
 };

v2: Fix commit message (Laurent)
    Rebase due to earlier removal of many fb->pixel_format uses,
    including the 'fb->format = drm_format_info(fb->format->format);'
    snafu
v3: Adjusted the semantic patch a bit and regenerated due to code
    changes

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

parent 272725c7

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2072,7 +2072,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc,

		pipe_config = AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG);

		switch (target_fb->pixel_format) {
		switch (target_fb->format->format) {
		case DRM_FORMAT_C8:
		fb_format = REG_SET_FIELD(0, GRPH_CONTROL, GRPH_DEPTH, 0);
		fb_format = REG_SET_FIELD(fb_format, GRPH_CONTROL, GRPH_FORMAT, 0);
		@@ -2145,7 +2145,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc,
		break;
		default:
		DRM_ERROR("Unsupported screen format %s\n",
		drm_get_format_name(target_fb->pixel_format, &format_name));
		drm_get_format_name(target_fb->format->format, &format_name));
		return -EINVAL;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2053,7 +2053,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,

		pipe_config = AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG);

		switch (target_fb->pixel_format) {
		switch (target_fb->format->format) {
		case DRM_FORMAT_C8:
		fb_format = REG_SET_FIELD(0, GRPH_CONTROL, GRPH_DEPTH, 0);
		fb_format = REG_SET_FIELD(fb_format, GRPH_CONTROL, GRPH_FORMAT, 0);
		@@ -2126,7 +2126,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
		break;
		default:
		DRM_ERROR("Unsupported screen format %s\n",
		drm_get_format_name(target_fb->pixel_format, &format_name));
		drm_get_format_name(target_fb->format->format, &format_name));
		return -EINVAL;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1501,7 +1501,7 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc,
		amdgpu_bo_get_tiling_flags(abo, &tiling_flags);
		amdgpu_bo_unreserve(abo);

		switch (target_fb->pixel_format) {
		switch (target_fb->format->format) {
		case DRM_FORMAT_C8:
		fb_format = (GRPH_DEPTH(GRPH_DEPTH_8BPP) \|
		GRPH_FORMAT(GRPH_FORMAT_INDEXED));
		@@ -1567,7 +1567,7 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc,
		break;
		default:
		DRM_ERROR("Unsupported screen format %s\n",
		drm_get_format_name(target_fb->pixel_format, &format_name));
		drm_get_format_name(target_fb->format->format, &format_name));
		return -EINVAL;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1950,7 +1950,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,

		pipe_config = AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG);

		switch (target_fb->pixel_format) {
		switch (target_fb->format->format) {
		case DRM_FORMAT_C8:
		fb_format = ((GRPH_DEPTH_8BPP << GRPH_CONTROL__GRPH_DEPTH__SHIFT) \|
		(GRPH_FORMAT_INDEXED << GRPH_CONTROL__GRPH_FORMAT__SHIFT));
		@@ -2016,7 +2016,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,
		break;
		default:
		DRM_ERROR("Unsupported screen format %s\n",
		drm_get_format_name(target_fb->pixel_format, &format_name));
		drm_get_format_name(target_fb->format->format, &format_name));
		return -EINVAL;
		}

drivers/gpu/drm/arc/arcpgu_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc)
		{
		struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
		const struct drm_framebuffer *fb = crtc->primary->state->fb;
		uint32_t pixel_format = fb->pixel_format;
		uint32_t pixel_format = fb->format->format;
		struct simplefb_format *format = NULL;
		int i;