drm/vmwgfx: Replace deprecated PTR_RET
Subsystems (4)
PATCH 1/1 drm/vmwgfx: Replace deprecated PTR_RET
Commit 508108ea2747 ("drm/vmwgfx: Don't refcount command-buffer managed resource lookups during command buffer validation") slips in use of deprecated PTR_RET. Use PTR_ERR_OR_ZERO instead.
As the PTR_ERR_OR_ZERO is a bit longer than PTR_RET, we introduce local variable ret for proper indentation and line-length limits.
---
applies cleanly on current master (9455d25f4e3b) and next-20191207 compile-tested on x86_64_defconfig + DRM_VMWGFX=y
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +15 -6
@@ -2377,9 +2377,12 @@ static int vmw_cmd_dx_clear_rendertarget_view(struct vmw_private *dev_priv, { VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearRenderTargetView) container_of(header, typeof(*cmd), header); +struct vmw_resource *ret; -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_rt, - cmd->body.renderTargetViewId)); + ret =vmw_view_id_val_add (sw_context, vmw_view_rt, + cmd->body.renderTargetViewId); + +return PTR_ERR_OR_ZERO (ret); }/**
@@ -2396,9 +2399,12 @@ static int vmw_cmd_dx_clear_depthstencil_view(struct vmw_private *dev_priv, { VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearDepthStencilView) container_of(header, typeof(*cmd), header); +struct vmw_resource *ret; + + ret =vmw_view_id_val_add (sw_context, vmw_view_ds, + cmd->body.depthStencilViewId); -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_ds, - cmd->body.depthStencilViewId)); +return PTR_ERR_OR_ZERO (ret); } static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv,
@@ -2741,9 +2747,12 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv, { VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXGenMips) container_of(header, typeof(*cmd), header); +struct vmw_resource *ret; + + ret =vmw_view_id_val_add (sw_context, vmw_view_sr, + cmd->body.shaderResourceViewId); -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_sr, - cmd->body.shaderResourceViewId)); +return PTR_ERR_OR_ZERO (ret); }/**
Signature · 1 line
2.17.1
Quoted 8 lines
De: "Lukas Bulwahn" <[email protected]>
À: "Thomas Hellstrom" <[email protected]>, [email protected]
Cc: "David Airlie" <[email protected]>, "Daniel Vetter" <[email protected]>, "Sinclair Yeh" <[email protected]>, [email protected], [email protected], [email protected], "Lukas Bulwahn" <[email protected]>
Envoyé: Dimanche 8 Décembre 2019 18:53:28
Objet: [PATCH] drm/vmwgfx: Replace deprecatedPTR_RET
Quoted 6 lines
Commit
508108ea2747("drm/vmwgfx: Don't refcount command-buffer managed resource lookups during command buffer validation") slips in use of deprecatedPTR_RET. UsePTR_ERR_OR_ZEROinstead.As the
PTR_ERR_OR_ZEROis a bit longer thanPTR_RET, we introduce local variable ret for proper indentation and line-length limits.
Is 0 actually possible? I have the impression that it is not, but perhaps I missed something.
julia
Quoted 60 lines
Signed-off-by Lukas Bulwahn <[email protected]>---
applies cleanly on current master (9455d25f4e3b) and next-20191207 compile-tested onx86_64_defconfig+ DRM_VMWGFX=y
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c| 21 +++++++++++++++------1 file changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +15
-7@@ -2377,9 +2377,12 @@ static int vmw_cmd_dx_clear_rendertarget_view(struct vmw_private *dev_priv, {VMW_DECLARE_CMD_VAR (*cmd, SVGA3dCmdDXClearRenderTargetView) >container_of (header,typeof (*cmd), header); +struct vmw_resource *ret; -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_rt, - cmd->body.renderTargetViewId)); + ret =vmw_view_id_val_add (sw_context, vmw_view_rt, + cmd->body.renderTargetViewId); + +return PTR_ERR_OR_ZERO (ret); }/** @@ -2396,9 +2399,12 @@ static int vmw_cmd_dx_clear_depthstencil_view(struct vmw_private *dev_priv, {VMW_DECLARE_CMD_VAR (*cmd, SVGA3dCmdDXClearDepthStencilView) >container_of (header,typeof (*cmd), header); +struct vmw_resource *ret; + + ret =vmw_view_id_val_add (sw_context, vmw_view_ds, + cmd->body.depthStencilViewId); -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_ds, - cmd->body.depthStencilViewId)); +return PTR_ERR_OR_ZERO (ret); } static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv,@@ -2741,9 +2747,12 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv, {VMW_DECLARE_CMD_VAR (*cmd, SVGA3dCmdDXGenMips) >container_of (header,typeof (*cmd), header); +struct vmw_resource *ret; + + ret =vmw_view_id_val_add (sw_context, vmw_view_sr, + cmd->body.shaderResourceViewId); -return PTR_RET (vmw_view_id_val_add (sw_context, vmw_view_sr, - cmd->body.shaderResourceViewId)); +return PTR_ERR_OR_ZERO (ret); }/** -- 2.17.1
Quoted 9 lines · Julia Lawall
Quoted 8 lines
De: "Lukas Bulwahn" <[email protected]>
À: "Thomas Hellstrom" <[email protected]>, [email protected]
Cc: "David Airlie" <[email protected]>, "Daniel Vetter" <[email protected]>, "Sinclair Yeh" <[email protected]>, [email protected], [email protected], [email protected], "Lukas Bulwahn" <[email protected]>
Envoyé: Dimanche 8 Décembre 2019 18:53:28
Objet: [PATCH] drm/vmwgfx: Replace deprecatedPTR_RET
Quoted 9 lines
Quoted 6 lines
Commit
508108ea2747("drm/vmwgfx: Don't refcount command-buffer managed resource lookups during command buffer validation") slips in use of deprecatedPTR_RET. UsePTR_ERR_OR_ZEROinstead.As the
PTR_ERR_OR_ZEROis a bit longer thanPTR_RET, we introduce local variable ret for proper indentation and line-length limits.Is 0 actually possible? I have the impression that it is not, but perhaps I missed something.
I did not sanity-check if 0 is possible before patch submission, just cleaning the syntatic stuff here to prepare final removal of the deprecated PTR_RET.
But as far as I see:
vmw_cmd_dx_clear_rendertarget_view
-> vmw_view_id_val_add
-> vmw_view_lookup
-> vmw_cmdbuf_res_lookup
which would then return a proper pointer/a non PTR_ERR value and hence, it would be possible that PTR_ERR_OR_ZERO returns 0. It all looks pretty sane.
Lukas
T24gU3VuLCAyMDE5LTEyLTA4IGF0IDExOjUzICswMTAwLCBMdWthcyBCdWx3YWhuIHdyb3RlOg0K PiBDb21taXQgNTA4MTA4ZWEyNzQ3ICgiZHJtL3Ztd2dmeDogRG9uJ3QgcmVmY291bnQgY29tbWFu ZC1idWZmZXINCj4gbWFuYWdlZA0KPiByZXNvdXJjZSBsb29rdXBzIGR1cmluZyBjb21tYW5kIGJ1 ZmZlciB2YWxpZGF0aW9uIikgc2xpcHMgaW4gdXNlIG9mDQo+IGRlcHJlY2F0ZWQgUFRSX1JFVC4g VXNlIFBUUl9FUlJfT1JfWkVSTyBpbnN0ZWFkLg0KPiANCj4gQXMgdGhlIFBUUl9FUlJfT1JfWkVS TyBpcyBhIGJpdCBsb25nZXIgdGhhbiBQVFJfUkVULCB3ZSBpbnRyb2R1Y2UNCj4gbG9jYWwgdmFy aWFibGUgcmV0IGZvciBwcm9wZXIgaW5kZW50YXRpb24gYW5kIGxpbmUtbGVuZ3RoIGxpbWl0cy4N Cj4gDQo+IFNpZ25lZC1vZmYtYnk6IEx1a2FzIEJ1bHdhaG4gPGx1a2FzLmJ1bHdhaG5AZ21haWwu Y29tPg0KPiAtLS0NCj4gYXBwbGllcyBjbGVhbmx5IG9uIGN1cnJlbnQgbWFzdGVyICg5NDU1ZDI1 ZjRlM2IpIGFuZCBuZXh0LTIwMTkxMjA3DQo+IGNvbXBpbGUtdGVzdGVkIG9uIHg4Nl82NF9kZWZj b25maWcgKyBEUk1fVk1XR0ZYPXkNCj4gDQo+ICBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dm eF9leGVjYnVmLmMgfCAyMSArKysrKysrKysrKysrKystLS0tLS0NCj4gIDEgZmlsZSBjaGFuZ2Vk LCAxNSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYw0KPiBiL2RyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYw0KPiBpbmRleCA5MzRhZDdjMGMzNDIuLjczNDg5YTQ1 ZGVjYiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZXhlY2J1 Zi5jDQo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYw0KPiBA QCAtMjM3Nyw5ICsyMzc3LDEyIEBAIHN0YXRpYyBpbnQNCj4gdm13X2NtZF9keF9jbGVhcl9yZW5k ZXJ0YXJnZXRfdmlldyhzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LA0KPiAgew0KPiAgCVZN V19ERUNMQVJFX0NNRF9WQVIoKmNtZCwgU1ZHQTNkQ21kRFhDbGVhclJlbmRlclRhcmdldFZpZXcp ID0NCj4gIAkJY29udGFpbmVyX29mKGhlYWRlciwgdHlwZW9mKCpjbWQpLCBoZWFkZXIpOw0KPiAr CXN0cnVjdCB2bXdfcmVzb3VyY2UgKnJldDsNCj4gIA0KPiAtCXJldHVybiBQVFJfUkVUKHZtd192 aWV3X2lkX3ZhbF9hZGQoc3dfY29udGV4dCwgdm13X3ZpZXdfcnQsDQo+IC0JCQkJCSAgIGNtZC0N Cj4gPmJvZHkucmVuZGVyVGFyZ2V0Vmlld0lkKSk7DQo+ICsJcmV0ID0gdm13X3ZpZXdfaWRfdmFs X2FkZChzd19jb250ZXh0LCB2bXdfdmlld19ydCwNCj4gKwkJCQkgIGNtZC0+Ym9keS5yZW5kZXJU YXJnZXRWaWV3SWQpOw0KPiArDQo+ICsJcmV0dXJuIFBUUl9FUlJfT1JfWkVSTyhyZXQpOw0KPiAg fQ0KPiAgDQo+ICAvKioNCj4gQEAgLTIzOTYsOSArMjM5OSwxMiBAQCBzdGF0aWMgaW50DQo+IHZt d19jbWRfZHhfY2xlYXJfZGVwdGhzdGVuY2lsX3ZpZXcoc3RydWN0IHZtd19wcml2YXRlICpkZXZf cHJpdiwNCj4gIHsNCj4gIAlWTVdfREVDTEFSRV9DTURfVkFSKCpjbWQsIFNWR0EzZENtZERYQ2xl YXJEZXB0aFN0ZW5jaWxWaWV3KSA9DQo+ICAJCWNvbnRhaW5lcl9vZihoZWFkZXIsIHR5cGVvZigq Y21kKSwgaGVhZGVyKTsNCj4gKwlzdHJ1Y3Qgdm13X3Jlc291cmNlICpyZXQ7DQo+ICsNCj4gKwly ZXQgPSB2bXdfdmlld19pZF92YWxfYWRkKHN3X2NvbnRleHQsIHZtd192aWV3X2RzLA0KPiArCQkJ CSAgY21kLT5ib2R5LmRlcHRoU3RlbmNpbFZpZXdJZCk7DQo+ICANCj4gLQlyZXR1cm4gUFRSX1JF VCh2bXdfdmlld19pZF92YWxfYWRkKHN3X2NvbnRleHQsIHZtd192aWV3X2RzLA0KPiAtCQkJCQkg ICBjbWQtDQo+ID5ib2R5LmRlcHRoU3RlbmNpbFZpZXdJZCkpOw0KPiArCXJldHVybiBQVFJfRVJS X09SX1pFUk8ocmV0KTsNCj4gIH0NCj4gIA0KPiAgc3RhdGljIGludCB2bXdfY21kX2R4X3ZpZXdf ZGVmaW5lKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsDQo+IEBAIC0yNzQxLDkgKzI3NDcs MTIgQEAgc3RhdGljIGludCB2bXdfY21kX2R4X2dlbm1pcHMoc3RydWN0DQo+IHZtd19wcml2YXRl ICpkZXZfcHJpdiwNCj4gIHsNCj4gIAlWTVdfREVDTEFSRV9DTURfVkFSKCpjbWQsIFNWR0EzZENt ZERYR2VuTWlwcykgPQ0KPiAgCQljb250YWluZXJfb2YoaGVhZGVyLCB0eXBlb2YoKmNtZCksIGhl YWRlcik7DQo+ICsJc3RydWN0IHZtd19yZXNvdXJjZSAqcmV0Ow0KPiArDQo+ICsJcmV0ID0gdm13 X3ZpZXdfaWRfdmFsX2FkZChzd19jb250ZXh0LCB2bXdfdmlld19zciwNCj4gKwkJCQkgIGNtZC0+ Ym9keS5zaGFkZXJSZXNvdXJjZVZpZXdJZCk7DQo+ICANCj4gLQlyZXR1cm4gUFRSX1JFVCh2bXdf dmlld19pZF92YWxfYWRkKHN3X2NvbnRleHQsIHZtd192aWV3X3NyLA0KPiAtCQkJCQkgICBjbWQt DQo+ID5ib2R5LnNoYWRlclJlc291cmNlVmlld0lkKSk7DQo+ICsJcmV0dXJuIFBUUl9FUlJfT1Jf WkVSTyhyZXQpOw0KPiAgfQ0KPiAgDQo+ICAvKioNCg0KUmV2aWV3ZWQtYnk6IFRob21hcyBIZWxs c3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4NCg0KSSB3aWxsIGluY2x1ZGUgdGhpcyBpbiB2 bXdnZngtbmV4dC4NClRoYW5rcywNClRob21hcw0KDQo