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

Commit b00c600e authored Dec 14, 2016 by Ville Syrjälä

drm: Nuke fb->depth



Replace uses of fb->depth with fb->format->depth. Less duplicate
information is a good thing.

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

@@
struct nouveau_framebuffer *fb;
@@
- fb->base.depth
+ fb->base.format->depth

@@
struct drm_framebuffer fb;
@@
- fb.depth
+ fb.format->depth

@@
struct drm_framebuffer *fb;
@@
- fb->depth
+ fb->format->depth

@@
struct drm_framebuffer fb;
@@
- (fb.format->depth)
+ fb.format->depth

@@
struct drm_framebuffer *fb;
@@
- (fb->format->depth)
+ fb->format->depth

@@
@@
 struct drm_framebuffer {
	 ...
-	 unsigned int depth;
	 ...
 };

v2: Drop the vmw stuff (Daniel)
    Rerun spatch 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>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1481751095-18249-1-git-send-email-ville.syrjala@linux.intel.com

parent 145fcb11

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,

		strcpy(info->fix.id, "amdgpudrmfb");

		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);

		info->flags = FBINFO_DEFAULT \| FBINFO_CAN_FORCE_OUTPUT;
		info->fbops = &amdgpufb_ops;
		@@ -272,7 +272,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
		DRM_INFO("fb mappable at 0x%lX\n", info->fix.smem_start);
		DRM_INFO("vram apper at 0x%lX\n", (unsigned long)adev->mc.aper_base);
		DRM_INFO("size %lu\n", (unsigned long)amdgpu_bo_size(abo));
		DRM_INFO("fb depth is %d\n", fb->depth);
		DRM_INFO("fb depth is %d\n", fb->format->depth);
		DRM_INFO(" pitch is %d\n", fb->pitches[0]);

		vga_switcheroo_client_fb_set(adev->ddev->pdev, info);

drivers/gpu/drm/armada/armada_fbdev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,8 @@ static int armada_fb_create(struct drm_fb_helper *fbh,
		info->screen_base = ptr;
		fbh->fb = &dfb->fb;

		drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], dfb->fb.depth);
		drm_fb_helper_fill_fix(info, dfb->fb.pitches[0],
		dfb->fb.format->depth);
		drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);

		DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",

drivers/gpu/drm/ast/ast_fb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ static int astfb_create(struct drm_fb_helper *helper,
		info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
		info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);

		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
		drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height);

		info->screen_base = sysram;

drivers/gpu/drm/bochs/bochs_fbdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ static int bochsfb_create(struct drm_fb_helper *helper,
		info->flags = FBINFO_DEFAULT;
		info->fbops = &bochsfb_ops;

		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
		drm_fb_helper_fill_var(info, &bochs->fb.helper, sizes->fb_width,
		sizes->fb_height);

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
		info->flags = FBINFO_DEFAULT;
		info->fbops = &cirrusfb_ops;

		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
		drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
		drm_fb_helper_fill_var(info, &gfbdev->helper, sizes->fb_width,
		sizes->fb_height);

		@@ -238,7 +238,7 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
		DRM_INFO("fb mappable at 0x%lX\n", info->fix.smem_start);
		DRM_INFO("vram aper at 0x%lX\n", (unsigned long)info->fix.smem_start);
		DRM_INFO("size %lu\n", (unsigned long)info->fix.smem_len);
		DRM_INFO("fb depth is %d\n", fb->depth);
		DRM_INFO("fb depth is %d\n", fb->format->depth);
		DRM_INFO(" pitch is %d\n", fb->pitches[0]);

		return 0;