[PATCH 6/7] drm/bochs: don't use ttm bo->offset
Nirmoy
nirmodas at amd.com
Mon Feb 17 12:52:39 UTC 2020
On 2/17/20 1:41 PM, Gerd Hoffmann wrote:
> On Mon, Feb 17, 2020 at 11:18:40AM +0100, Nirmoy Das wrote:
>> Calculate GPU offset within bochs driver itself without depending on
>> bo->offset
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>
>> ---
>> drivers/gpu/drm/bochs/bochs_kms.c | 3 ++-
>> drivers/gpu/drm/drm_gem_vram_helper.c | 2 +-
>> 2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
>> index 8066d7d370d5..852ec7910d84 100644
>> --- a/drivers/gpu/drm/bochs/bochs_kms.c
>> +++ b/drivers/gpu/drm/bochs/bochs_kms.c
>> @@ -38,7 +38,8 @@ static void bochs_plane_update(struct bochs_device *bochs,
>> state->crtc_x,
>> state->crtc_y,
>> state->fb->pitches[0],
>> - state->fb->offsets[0] + gbo->bo.offset);
>> + state->fb->offsets[0] +
>> + (gbo->bo.mem.start << PAGE_SHIFT));
> I'd suggest to use drm_gem_vram_offset() here ...
>
>> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
>> index 92a11bb42365..e7ef4cd8116d 100644
>> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
>> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
>> @@ -214,7 +214,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)
>> {
>> if (WARN_ON_ONCE(!gbo->pin_count))
>> return (s64)-ENODEV;
>> - return gbo->bo.offset;
>> + return gbo->bo.mem.start << PAGE_SHIFT;
> ... and move this to a separate patch. The vram helpers are used by
> more drivers than just bochs.
Thanks for reviewing Gerd, will send next version with your suggestions
applied.
Regards,
Nirmoy
>
> cheers,
> Gerd
>
More information about the amd-gfx
mailing list