Commit 18340587 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Ben Skeggs
Browse files

drm/nouveau/kms: Remove field nvbo from struct nouveau_framebuffer 



The buffer object stored in nvbo is also available GEM object in obj[0]
of struct drm_framebuffer. Therefore remove nvbo in favor obj[0] and
replace all references accordingly. This may require an additional cast.

With this change we can already replace nouveau_user_framebuffer_destroy()
and nouveau_user_framebuffer_create_handle() with generic GEM helpers.
Calls to nouveau_framebuffer_new() receive a GEM object.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 84c862b5

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+10 −9
Original line number Diff line number Diff line
@@ -605,15 +605,16 @@ static int 
nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)

{

	struct nv04_display *disp = nv04_display(crtc->dev);

	struct nouveau_framebuffer *nvfb = nouveau_framebuffer(crtc->primary->fb);

	struct drm_framebuffer *fb = crtc->primary->fb;

	struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	int ret;



	ret = nouveau_bo_pin(nvfb->nvbo, TTM_PL_FLAG_VRAM, false);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	if (ret == 0) {

		if (disp->image[nv_crtc->index])

			nouveau_bo_unpin(disp->image[nv_crtc->index]);

		nouveau_bo_ref(nvfb->nvbo, &disp->image[nv_crtc->index]);

		nouveau_bo_ref(nvbo, &disp->image[nv_crtc->index]);

	}



	return ret;
@@ -822,8 +823,8 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	struct drm_device *dev = crtc->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nv04_crtc_reg *regp = &nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];

	struct nouveau_bo *nvbo;

	struct drm_framebuffer *drm_fb;

	struct nouveau_framebuffer *fb;

	int arb_burst, arb_lwm;



	NV_DEBUG(drm, "index %d\n", nv_crtc->index);
@@ -839,13 +840,12 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	 */

	if (atomic) {

		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	} else {

		drm_fb = crtc->primary->fb;

		fb = nouveau_framebuffer(crtc->primary->fb);

	}



	nv_crtc->fb.offset = fb->nvbo->bo.offset;

	nvbo = nouveau_gem_object(drm_fb->obj[0]);

	nv_crtc->fb.offset = nvbo->bo.offset;



	if (nv_crtc->lut.depth != drm_fb->format->depth) {

		nv_crtc->lut.depth = drm_fb->format->depth;
@@ -1143,8 +1143,9 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
	const int swap_interval = (flags & DRM_MODE_PAGE_FLIP_ASYNC) ? 0 : 1;

	struct drm_device *dev = crtc->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_bo *old_bo = nouveau_framebuffer(crtc->primary->fb)->nvbo;

	struct nouveau_bo *new_bo = nouveau_framebuffer(fb)->nvbo;

	struct drm_framebuffer *old_fb = crtc->primary->fb;

	struct nouveau_bo *old_bo = nouveau_gem_object(old_fb->obj[0]);

	struct nouveau_bo *new_bo = nouveau_gem_object(fb->obj[0]);

	struct nv04_page_flip_state *s;

	struct nouveau_channel *chan;

	struct nouveau_cli *cli;

drivers/gpu/drm/nouveau/dispnv04/disp.c

+11 −10
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "nouveau_encoder.h"

#include "nouveau_connector.h"

#include "nouveau_bo.h"

#include "nouveau_gem.h"



#include <nvif/if0004.h>
@@ -52,13 +53,13 @@ nv04_display_fini(struct drm_device *dev, bool suspend) 


	/* Un-pin FB and cursors so they'll be evicted to system memory. */

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

		struct nouveau_framebuffer *nouveau_fb;

		struct drm_framebuffer *fb = crtc->primary->fb;

		struct nouveau_bo *nvbo;



		nouveau_fb = nouveau_framebuffer(crtc->primary->fb);

		if (!nouveau_fb || !nouveau_fb->nvbo)

		if (!fb || !fb->obj[0])

			continue;



		nouveau_bo_unpin(nouveau_fb->nvbo);

		nvbo = nouveau_gem_object(fb->obj[0]);

		nouveau_bo_unpin(nvbo);

	}



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -104,13 +105,13 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime) 


	/* Re-pin FB/cursors. */

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

		struct nouveau_framebuffer *nouveau_fb;

		struct drm_framebuffer *fb = crtc->primary->fb;

		struct nouveau_bo *nvbo;



		nouveau_fb = nouveau_framebuffer(crtc->primary->fb);

		if (!nouveau_fb || !nouveau_fb->nvbo)

		if (!fb || !fb->obj[0])

			continue;



		ret = nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM, true);

		nvbo = nouveau_gem_object(fb->obj[0]);

		ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, true);

		if (ret)

			NV_ERROR(drm, "Could not pin framebuffer\n");

	}

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+12 −9
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "nouveau_bo.h"

#include "nouveau_connector.h"

#include "nouveau_display.h"

#include "nouveau_gem.h"

#include "nvreg.h"

#include "disp.h"
@@ -120,9 +121,9 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct nvif_object *dev = &drm->client.device.object;

	struct nouveau_plane *nv_plane =

		container_of(plane, struct nouveau_plane, base);

	struct nouveau_framebuffer *nv_fb = nouveau_framebuffer(fb);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct nouveau_bo *cur = nv_plane->cur;

	struct nouveau_bo *nvbo;

	bool flip = nv_plane->flip;

	int soff = NV_PCRTC0_SIZE * nv_crtc->index;

	int soff2 = NV_PCRTC0_SIZE * !nv_crtc->index;
@@ -140,17 +141,18 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	if (ret)

		return ret;



	ret = nouveau_bo_pin(nv_fb->nvbo, TTM_PL_FLAG_VRAM, false);

	nvbo = nouveau_gem_object(fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	if (ret)

		return ret;



	nv_plane->cur = nv_fb->nvbo;

	nv_plane->cur = nvbo;



	nvif_mask(dev, NV_PCRTC_ENGINE_CTRL + soff, NV_CRTC_FSEL_OVERLAY, NV_CRTC_FSEL_OVERLAY);

	nvif_mask(dev, NV_PCRTC_ENGINE_CTRL + soff2, NV_CRTC_FSEL_OVERLAY, 0);



	nvif_wr32(dev, NV_PVIDEO_BASE(flip), 0);

	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nv_fb->nvbo->bo.offset);

	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nvbo->bo.offset);

	nvif_wr32(dev, NV_PVIDEO_SIZE_IN(flip), src_h << 16 | src_w);

	nvif_wr32(dev, NV_PVIDEO_POINT_IN(flip), src_y << 16 | src_x);

	nvif_wr32(dev, NV_PVIDEO_DS_DX(flip), (src_w << 20) / crtc_w);
@@ -172,7 +174,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	if (format & NV_PVIDEO_FORMAT_PLANAR) {

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_BASE(flip), 0);

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_OFFSET_BUFF(flip),

			nv_fb->nvbo->bo.offset + fb->offsets[1]);

			nvbo->bo.offset + fb->offsets[1]);

	}

	nvif_wr32(dev, NV_PVIDEO_FORMAT(flip), format | fb->pitches[0]);

	nvif_wr32(dev, NV_PVIDEO_STOP, 0);
@@ -368,8 +370,8 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct nvif_object *dev = &nouveau_drm(plane->dev)->client.device.object;

	struct nouveau_plane *nv_plane =

		container_of(plane, struct nouveau_plane, base);

	struct nouveau_framebuffer *nv_fb = nouveau_framebuffer(fb);

	struct nouveau_bo *cur = nv_plane->cur;

	struct nouveau_bo *nvbo;

	uint32_t overlay = 1;

	int brightness = (nv_plane->brightness - 512) * 62 / 512;

	int ret, i;
@@ -384,11 +386,12 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	if (ret)

		return ret;



	ret = nouveau_bo_pin(nv_fb->nvbo, TTM_PL_FLAG_VRAM, false);

	nvbo = nouveau_gem_object(fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	if (ret)

		return ret;



	nv_plane->cur = nv_fb->nvbo;

	nv_plane->cur = nvbo;



	nvif_wr32(dev, NV_PVIDEO_OE_STATE, 0);

	nvif_wr32(dev, NV_PVIDEO_SU_STATE, 0);
@@ -396,7 +399,7 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 


	for (i = 0; i < 2; i++) {

		nvif_wr32(dev, NV_PVIDEO_BUFF0_START_ADDRESS + 4 * i,

			  nv_fb->nvbo->bo.offset);

			  nvbo->bo.offset);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_PITCH_LENGTH + 4 * i,

			  fb->pitches[0]);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_OFFSET + 4 * i, 0);

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+16 −10
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <drm/drm_fourcc.h>



#include "nouveau_bo.h"

#include "nouveau_gem.h"



static void

nv50_wndw_ctxdma_del(struct nv50_wndw_ctxdma *ctxdma)
@@ -43,7 +44,8 @@ nv50_wndw_ctxdma_new(struct nv50_wndw *wndw, struct nouveau_framebuffer *fb) 
{

	struct nouveau_drm *drm = nouveau_drm(fb->base.dev);

	struct nv50_wndw_ctxdma *ctxdma;

	const u8    kind = fb->nvbo->kind;

	struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]);

	const u8    kind = nvbo->kind;

	const u32 handle = 0xfb000000 | kind;

	struct {

		struct nv_dma_v0 base;
@@ -236,6 +238,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, 
{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(asyw->state.fb);

	struct nouveau_drm *drm = nouveau_drm(wndw->plane.dev);

	struct nouveau_bo *nvbo = nouveau_gem_object(fb->base.obj[0]);

	int ret;



	NV_ATOMIC(drm, "%s acquire\n", wndw->plane.name);
@@ -243,7 +246,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, 
	if (asyw->state.fb != armw->state.fb || !armw->visible || modeset) {

		asyw->image.w = fb->base.width;

		asyw->image.h = fb->base.height;

		asyw->image.kind = fb->nvbo->kind;

		asyw->image.kind = nvbo->kind;



		ret = nv50_wndw_atomic_check_acquire_rgb(asyw);

		if (ret) {
@@ -255,9 +258,9 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, 
		if (asyw->image.kind) {

			asyw->image.layout = 0;

			if (drm->client.device.info.chipset >= 0xc0)

				asyw->image.blockh = fb->nvbo->mode >> 4;

				asyw->image.blockh = nvbo->mode >> 4;

			else

				asyw->image.blockh = fb->nvbo->mode;

				asyw->image.blockh = nvbo->mode;

			asyw->image.blocks[0] = fb->base.pitches[0] / 64;

			asyw->image.pitch[0] = 0;

		} else {
@@ -471,14 +474,15 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) 
static void

nv50_wndw_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state)

{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(old_state->fb);

	struct nouveau_drm *drm = nouveau_drm(plane->dev);

	struct nouveau_bo *nvbo;



	NV_ATOMIC(drm, "%s cleanup: %p\n", plane->name, old_state->fb);

	if (!old_state->fb)

		return;



	nouveau_bo_unpin(fb->nvbo);

	nvbo = nouveau_gem_object(old_state->fb->obj[0]);

	nouveau_bo_unpin(nvbo);

}



static int
@@ -488,6 +492,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) 
	struct nouveau_drm *drm = nouveau_drm(plane->dev);

	struct nv50_wndw *wndw = nv50_wndw(plane);

	struct nv50_wndw_atom *asyw = nv50_wndw_atom(state);

	struct nouveau_bo *nvbo;

	struct nv50_head_atom *asyh;

	struct nv50_wndw_ctxdma *ctxdma;

	int ret;
@@ -496,22 +501,23 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) 
	if (!asyw->state.fb)

		return 0;



	ret = nouveau_bo_pin(fb->nvbo, TTM_PL_FLAG_VRAM, true);

	nvbo = nouveau_gem_object(state->fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, true);

	if (ret)

		return ret;



	if (wndw->ctxdma.parent) {

		ctxdma = nv50_wndw_ctxdma_new(wndw, fb);

		if (IS_ERR(ctxdma)) {

			nouveau_bo_unpin(fb->nvbo);

			nouveau_bo_unpin(nvbo);

			return PTR_ERR(ctxdma);

		}



		asyw->image.handle[0] = ctxdma->object.handle;

	}



	asyw->state.fence = dma_resv_get_excl_rcu(fb->nvbo->bo.base.resv);

	asyw->image.offset[0] = fb->nvbo->bo.offset;

	asyw->state.fence = dma_resv_get_excl_rcu(nvbo->bo.base.resv);

	asyw->image.offset[0] = nvbo->bo.offset;



	if (wndw->func->prepare) {

		asyh = nv50_head_atom_get(asyw->state.state, asyw->state.crtc);

drivers/gpu/drm/nouveau/nouveau_display.c

+6 −29
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>
@@ -179,37 +180,15 @@ nouveau_display_vblank_init(struct drm_device *dev) 
	return 0;

}



static void

nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)

{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);



	if (fb->nvbo)

		drm_gem_object_put_unlocked(&fb->nvbo->bo.base);



	drm_framebuffer_cleanup(drm_fb);

	kfree(fb);

}



static int

nouveau_user_framebuffer_create_handle(struct drm_framebuffer *drm_fb,

				       struct drm_file *file_priv,

				       unsigned int *handle)

{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);



	return drm_gem_handle_create(file_priv, &fb->nvbo->bo.base, handle);

}



static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = {

	.destroy = nouveau_user_framebuffer_destroy,

	.create_handle = nouveau_user_framebuffer_create_handle,

	.destroy = drm_gem_fb_destroy,

	.create_handle = drm_gem_fb_create_handle,

};



int

nouveau_framebuffer_new(struct drm_device *dev,

			const struct drm_mode_fb_cmd2 *mode_cmd,

			struct nouveau_bo *nvbo,

			struct drm_gem_object *gem,

			struct nouveau_framebuffer **pfb)

{

	struct nouveau_drm *drm = nouveau_drm(dev);
@@ -240,7 +219,7 @@ nouveau_framebuffer_new(struct drm_device *dev, 
		return -ENOMEM;



	drm_helper_mode_fill_fb_struct(dev, &fb->base, mode_cmd);

	fb->nvbo = nvbo;

	fb->base.obj[0] = gem;



	ret = drm_framebuffer_init(dev, &fb->base, &nouveau_framebuffer_funcs);

	if (ret)
@@ -254,16 +233,14 @@ nouveau_user_framebuffer_create(struct drm_device *dev, 
				const struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct nouveau_framebuffer *fb;

	struct nouveau_bo *nvbo;

	struct drm_gem_object *gem;

	int ret;



	gem = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);

	if (!gem)

		return ERR_PTR(-ENOENT);

	nvbo = nouveau_gem_object(gem);



	ret = nouveau_framebuffer_new(dev, mode_cmd, nvbo, &fb);

	ret = nouveau_framebuffer_new(dev, mode_cmd, gem, &fb);

	if (ret == 0)

		return &fb->base;

CRA Git | Maintained and supported by SUSTech CRA and CCSE