| Message ID | 20200219135322.56463-8-nirmoy.das@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | do not store GPU address in TTM | expand |
On Wed, Feb 19, 2020 at 02:53:21PM +0100, Nirmoy Das wrote: > Switch over to GEM VRAM's implementation to retrieve bo->offset > > Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> > --- > drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c > index 8066d7d370d5..18d2ec34534d 100644 > --- a/drivers/gpu/drm/bochs/bochs_kms.c > +++ b/drivers/gpu/drm/bochs/bochs_kms.c > @@ -29,16 +29,21 @@ static void bochs_plane_update(struct bochs_device *bochs, > struct drm_plane_state *state) > { > struct drm_gem_vram_object *gbo; > + s64 gpu_addr; > > if (!state->fb || !bochs->stride) > return; > > gbo = drm_gem_vram_of_gem(state->fb->obj[0]); > + gpu_addr = drm_gem_vram_offset(gbo); > + if (WARN_ON_ONCE(gpu_addr < 0)) > + return; /* Bug: we didn't pin the BO to VRAM in prepare_fb. */ That negative errno in gpu_addr from vram helpers is kinda wild. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > + > bochs_hw_setbase(bochs, > state->crtc_x, > state->crtc_y, > state->fb->pitches[0], > - state->fb->offsets[0] + gbo->bo.offset); > + state->fb->offsets[0] + gpu_addr); > bochs_hw_setformat(bochs, state->fb->format); > } > > -- > 2.25.0 >
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 8066d7d370d5..18d2ec34534d 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -29,16 +29,21 @@ static void bochs_plane_update(struct bochs_device *bochs, struct drm_plane_state *state) { struct drm_gem_vram_object *gbo; + s64 gpu_addr; if (!state->fb || !bochs->stride) return; gbo = drm_gem_vram_of_gem(state->fb->obj[0]); + gpu_addr = drm_gem_vram_offset(gbo); + if (WARN_ON_ONCE(gpu_addr < 0)) + return; /* Bug: we didn't pin the BO to VRAM in prepare_fb. */ + bochs_hw_setbase(bochs, state->crtc_x, state->crtc_y, state->fb->pitches[0], - state->fb->offsets[0] + gbo->bo.offset); + state->fb->offsets[0] + gpu_addr); bochs_hw_setformat(bochs, state->fb->format); }
Switch over to GEM VRAM's implementation to retrieve bo->offset Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> --- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.25.0