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

Commit f4510a27 authored by Matt Roper's avatar Matt Roper Committed by Rob Clark
Browse files

drm: Replace crtc fb with primary plane fb (v3) 



Now that CRTC's have a primary plane, there's no need to track the
framebuffer in the CRTC.  Replace all references to the CRTC fb with the
primary plane's fb.

This patch was generated by the Coccinelle semantic patching tool using
the following rules:

        @@ struct drm_crtc C; @@
        -   (C).fb
        +   C.primary->fb

        @@ struct drm_crtc *C; @@
        -   (C)->fb
        +   C->primary->fb

v3: Generate patch via coccinelle.  Actual removal of crtc->fb has been
    moved to a subsequent patch.

v2: Fixup several lingering crtc->fb instances that were missed in the
    first patch iteration.  [Rob Clark]

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
parent 2d82d188

drivers/gpu/drm/armada/armada_crtc.c

+12 −11
Original line number Diff line number Diff line
@@ -478,11 +478,12 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, 
	unsigned i;

	bool interlaced;



	drm_framebuffer_reference(crtc->fb);

	drm_framebuffer_reference(crtc->primary->fb);



	interlaced = !!(adj->flags & DRM_MODE_FLAG_INTERLACE);



	i = armada_drm_crtc_calc_fb(dcrtc->crtc.fb, x, y, regs, interlaced);

	i = armada_drm_crtc_calc_fb(dcrtc->crtc.primary->fb,

				    x, y, regs, interlaced);



	rm = adj->crtc_hsync_start - adj->crtc_hdisplay;

	lm = adj->crtc_htotal - adj->crtc_hsync_end;
@@ -567,10 +568,10 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, 
	}



	val = CFG_GRA_ENA | CFG_GRA_HSMOOTH;

	val |= CFG_GRA_FMT(drm_fb_to_armada_fb(dcrtc->crtc.fb)->fmt);

	val |= CFG_GRA_MOD(drm_fb_to_armada_fb(dcrtc->crtc.fb)->mod);

	val |= CFG_GRA_FMT(drm_fb_to_armada_fb(dcrtc->crtc.primary->fb)->fmt);

	val |= CFG_GRA_MOD(drm_fb_to_armada_fb(dcrtc->crtc.primary->fb)->mod);



	if (drm_fb_to_armada_fb(dcrtc->crtc.fb)->fmt > CFG_420)

	if (drm_fb_to_armada_fb(dcrtc->crtc.primary->fb)->fmt > CFG_420)

		val |= CFG_PALETTE_ENA;



	if (interlaced)
@@ -608,7 +609,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
	struct armada_regs regs[4];

	unsigned i;



	i = armada_drm_crtc_calc_fb(crtc->fb, crtc->x, crtc->y, regs,

	i = armada_drm_crtc_calc_fb(crtc->primary->fb, crtc->x, crtc->y, regs,

				    dcrtc->interlaced);

	armada_reg_queue_end(regs, i);
@@ -616,7 +617,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
	wait_event(dcrtc->frame_wait, !dcrtc->frame_work);



	/* Take a reference to the new fb as we're using it */

	drm_framebuffer_reference(crtc->fb);

	drm_framebuffer_reference(crtc->primary->fb);



	/* Update the base in the CRTC */

	armada_drm_crtc_update_regs(dcrtc, regs);
@@ -637,7 +638,7 @@ static void armada_drm_crtc_disable(struct drm_crtc *crtc) 
	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);



	armada_drm_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);

	armada_drm_crtc_finish_fb(dcrtc, crtc->fb, true);

	armada_drm_crtc_finish_fb(dcrtc, crtc->primary->fb, true);



	/* Power down most RAMs and FIFOs */

	writel_relaxed(CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 |
@@ -904,7 +905,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, 
	int ret;



	/* We don't support changing the pixel format */

	if (fb->pixel_format != crtc->fb->pixel_format)

	if (fb->pixel_format != crtc->primary->fb->pixel_format)

		return -EINVAL;



	work = kmalloc(sizeof(*work), GFP_KERNEL);
@@ -912,7 +913,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, 
		return -ENOMEM;



	work->event = event;

	work->old_fb = dcrtc->crtc.fb;

	work->old_fb = dcrtc->crtc.primary->fb;



	i = armada_drm_crtc_calc_fb(fb, crtc->x, crtc->y, work->regs,

				    dcrtc->interlaced);
@@ -941,7 +942,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, 
	 * will _not_ drop that reference on successful return from this

	 * function.  Simply mark this new framebuffer as the current one.

	 */

	dcrtc->crtc.fb = fb;

	dcrtc->crtc.primary->fb = fb;



	/*

	 * Finally, if the display is blanked, we won't receive an

drivers/gpu/drm/ast/ast_mode.c

+6 −6
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo 
	u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;

	u32 hborder, vborder;



	switch (crtc->fb->bits_per_pixel) {

	switch (crtc->primary->fb->bits_per_pixel) {

	case 8:

		vbios_mode->std_table = &vbios_stdtable[VGAModeIndex];

		color_index = VGAModeIndex - 1;
@@ -176,7 +176,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo 
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x8e, mode_id & 0xff);



		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0xa8);

		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->fb->bits_per_pixel);

		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->primary->fb->bits_per_pixel);

		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x93, adjusted_mode->clock / 1000);

		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x94, adjusted_mode->crtc_hdisplay);

		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x95, adjusted_mode->crtc_hdisplay >> 8);
@@ -340,7 +340,7 @@ static void ast_set_offset_reg(struct drm_crtc *crtc) 


	u16 offset;



	offset = crtc->fb->pitches[0] >> 3;

	offset = crtc->primary->fb->pitches[0] >> 3;

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x13, (offset & 0xff));

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xb0, (offset >> 8) & 0x3f);

}
@@ -365,7 +365,7 @@ static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode 
	struct ast_private *ast = crtc->dev->dev_private;

	u8 jregA0 = 0, jregA3 = 0, jregA8 = 0;



	switch (crtc->fb->bits_per_pixel) {

	switch (crtc->primary->fb->bits_per_pixel) {

	case 8:

		jregA0 = 0x70;

		jregA3 = 0x01;
@@ -418,7 +418,7 @@ static void ast_set_sync_reg(struct drm_device *dev, struct drm_display_mode *mo 
static bool ast_set_dac_reg(struct drm_crtc *crtc, struct drm_display_mode *mode,

		     struct ast_vbios_mode_info *vbios_mode)

{

	switch (crtc->fb->bits_per_pixel) {

	switch (crtc->primary->fb->bits_per_pixel) {

	case 8:

		break;

	default:
@@ -490,7 +490,7 @@ static int ast_crtc_do_set_base(struct drm_crtc *crtc, 
		ast_bo_unreserve(bo);

	}



	ast_fb = to_ast_framebuffer(crtc->fb);

	ast_fb = to_ast_framebuffer(crtc->primary->fb);

	obj = ast_fb->obj;

	bo = gem_to_ast_bo(obj);

drivers/gpu/drm/bochs/bochs_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
		}

	}



	if (WARN_ON(crtc->fb == NULL))

	if (WARN_ON(crtc->primary->fb == NULL))

		return -EINVAL;



	bochs_fb = to_bochs_framebuffer(crtc->fb);

	bochs_fb = to_bochs_framebuffer(crtc->primary->fb);

	bo = gem_to_bochs_bo(bochs_fb->obj);

	ret = ttm_bo_reserve(&bo->bo, true, false, false, 0);

	if (ret)

drivers/gpu/drm/cirrus/cirrus_mode.c

+5 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int cirrus_crtc_do_set_base(struct drm_crtc *crtc, 
		cirrus_bo_unreserve(bo);

	}



	cirrus_fb = to_cirrus_framebuffer(crtc->fb);

	cirrus_fb = to_cirrus_framebuffer(crtc->primary->fb);

	obj = cirrus_fb->obj;

	bo = gem_to_cirrus_bo(obj);
@@ -268,7 +268,7 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc, 
	sr07 = RREG8(SEQ_DATA);

	sr07 &= 0xe0;

	hdr = 0;

	switch (crtc->fb->bits_per_pixel) {

	switch (crtc->primary->fb->bits_per_pixel) {

	case 8:

		sr07 |= 0x11;

		break;
@@ -291,13 +291,13 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc, 
	WREG_SEQ(0x7, sr07);



	/* Program the pitch */

	tmp = crtc->fb->pitches[0] / 8;

	tmp = crtc->primary->fb->pitches[0] / 8;

	WREG_CRT(VGA_CRTC_OFFSET, tmp);



	/* Enable extended blanking and pitch bits, and enable full memory */

	tmp = 0x22;

	tmp |= (crtc->fb->pitches[0] >> 7) & 0x10;

	tmp |= (crtc->fb->pitches[0] >> 6) & 0x40;

	tmp |= (crtc->primary->fb->pitches[0] >> 7) & 0x10;

	tmp |= (crtc->primary->fb->pitches[0] >> 6) & 0x40;

	WREG_CRT(0x1b, tmp);



	/* Enable high-colour modes */

drivers/gpu/drm/drm_crtc.c

+13 −13
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) 
		drm_modeset_lock_all(dev);

		/* remove from any CRTC */

		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

			if (crtc->fb == fb) {

			if (crtc->primary->fb == fb) {

				/* should turn off the crtc */

				memset(&set, 0, sizeof(struct drm_mode_set));

				set.crtc = crtc;
@@ -1714,8 +1714,8 @@ int drm_mode_getcrtc(struct drm_device *dev, 
	crtc_resp->x = crtc->x;

	crtc_resp->y = crtc->y;

	crtc_resp->gamma_size = crtc->gamma_size;

	if (crtc->fb)

		crtc_resp->fb_id = crtc->fb->base.id;

	if (crtc->primary->fb)

		crtc_resp->fb_id = crtc->primary->fb->base.id;

	else

		crtc_resp->fb_id = 0;
@@ -2222,7 +2222,7 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) 
	 * crtcs. Atomic modeset will have saner semantics ...

	 */

	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head)

		tmp->old_fb = tmp->fb;

		tmp->old_fb = tmp->primary->fb;



	fb = set->fb;
@@ -2231,12 +2231,12 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) 
		crtc->primary->crtc = crtc;



		/* crtc->fb must be updated by ->set_config, enforces this. */

		WARN_ON(fb != crtc->fb);

		WARN_ON(fb != crtc->primary->fb);

	}



	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head) {

		if (tmp->fb)

			drm_framebuffer_reference(tmp->fb);

		if (tmp->primary->fb)

			drm_framebuffer_reference(tmp->primary->fb);

		if (tmp->old_fb)

			drm_framebuffer_unreference(tmp->old_fb);

	}
@@ -2340,12 +2340,12 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
		/* If we have a mode we need a framebuffer. */

		/* If we pass -1, set the mode with the currently bound fb */

		if (crtc_req->fb_id == -1) {

			if (!crtc->fb) {

			if (!crtc->primary->fb) {

				DRM_DEBUG_KMS("CRTC doesn't have current FB\n");

				ret = -EINVAL;

				goto out;

			}

			fb = crtc->fb;

			fb = crtc->primary->fb;

			/* Make refcounting symmetric with the lookup path. */

			drm_framebuffer_reference(fb);

		} else {
@@ -4139,7 +4139,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	crtc = obj_to_crtc(obj);



	mutex_lock(&crtc->mutex);

	if (crtc->fb == NULL) {

	if (crtc->primary->fb == NULL) {

		/* The framebuffer is currently unbound, presumably

		 * due to a hotplug event, that userspace has not

		 * yet discovered.
@@ -4161,7 +4161,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	if (ret)

		goto out;



	if (crtc->fb->pixel_format != fb->pixel_format) {

	if (crtc->primary->fb->pixel_format != fb->pixel_format) {

		DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer format.\n");

		ret = -EINVAL;

		goto out;
@@ -4194,7 +4194,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
			(void (*) (struct drm_pending_event *)) kfree;

	}



	old_fb = crtc->fb;

	old_fb = crtc->primary->fb;

	ret = crtc->funcs->page_flip(crtc, fb, e, page_flip->flags);

	if (ret) {

		if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {
@@ -4212,7 +4212,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
		 * Failing to do so will screw with the reference counting

		 * on framebuffers.

		 */

		WARN_ON(crtc->fb != fb);

		WARN_ON(crtc->primary->fb != fb);

		/* Unref only the old framebuffer. */

		fb = NULL;

	}