Hi
Am 13.08.20 um 11:08 schrieb Jani Nikula:
> On Thu, 13 Aug 2020, Thomas Zimmermann <tzimmermann@xxxxxxx> wrote:
>> GEM object functions deprecate several similar callback interfaces in
>> struct drm_driver. This patch replaces the per-driver callbacks with
>> per-instance callbacks in i915.
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
>> ---
>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 ++++++++-
>> drivers/gpu/drm/i915/i915_drv.c | 10 ++++++----
>> drivers/gpu/drm/i915/i915_drv.h | 1 +
>> drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 ---
>> 4 files changed, 15 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> index c8421fd9d2dc..bc15ee4f2bd5 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> @@ -41,7 +41,14 @@ static struct i915_global_object {
>>
>> struct drm_i915_gem_object *i915_gem_object_alloc(void)
>> {
>> - return kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);
>> + struct drm_i915_gem_object *obj;
>> +
>> + obj = kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);
>> + if (!obj)
>> + return NULL;
>> + obj->base.funcs = &i915_gem_object_funcs;
>> +
>> + return obj;
>> }
>>
>> void i915_gem_object_free(struct drm_i915_gem_object *obj)
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 068447f565a9..b09eee11c540 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1840,6 +1840,12 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
>> DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW),
>> };
>>
>> +const struct drm_gem_object_funcs i915_gem_object_funcs = {
>> + .free = i915_gem_free_object,
>> + .close = i915_gem_close_object,
>> + .export = i915_gem_prime_export,
>> +};
>> +
>
> Any reason not to make this static in i915_gem_object.c next to its only
> user?
That is just an oversight. Will be fixed in the next iteration. Thanks.
Best regards
Thomas
>
> BR,
> Jani.
>
>
>> static struct drm_driver driver = {
>> /* Don't use MTRRs here; the Xserver or userspace app should
>> * deal with them for Intel hardware.
>> @@ -1853,12 +1859,8 @@ static struct drm_driver driver = {
>> .lastclose = i915_driver_lastclose,
>> .postclose = i915_driver_postclose,
>>
>> - .gem_close_object = i915_gem_close_object,
>> - .gem_free_object_unlocked = i915_gem_free_object,
>> -
>> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
>> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
>> - .gem_prime_export = i915_gem_prime_export,
>> .gem_prime_import = i915_gem_prime_import,
>>
>> .dumb_create = i915_gem_dumb_create,
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index bacb4c762f5b..666db65fe69e 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -1736,6 +1736,7 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
>>
>> /* i915_drv.c */
>> extern const struct dev_pm_ops i915_pm_ops;
>> +extern const struct drm_gem_object_funcs i915_gem_object_funcs;
>>
>> int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
>> void i915_driver_remove(struct drm_i915_private *i915);
>> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
>> index ce4d4303229c..4725dad63e0a 100644
>> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
>> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
>> @@ -86,9 +86,6 @@ static struct drm_driver mock_driver = {
>> .name = "mock",
>> .driver_features = DRIVER_GEM,
>> .release = mock_device_release,
>> -
>> - .gem_close_object = i915_gem_close_object,
>> - .gem_free_object_unlocked = i915_gem_free_object,
>> };
>>
>> static void release_dev(struct device *dev)
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
