<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"></style> </head> <body dir="ltr"> <div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr"> <div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;"> <p style="margin-top:0; margin-bottom:0">Acked-by: Alex Deucher <alexander.deucher@amd.com><br> </p> </div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Christian König <ckoenig.leichtzumerken@gmail.com><br> <b>Sent:</b> Wednesday, March 21, 2018 9:08:18 AM<br> <b>To:</b> amd-gfx@lists.freedesktop.org<br> <b>Subject:</b> [PATCH] drm/amdgpu: fix "mitigate workaround for i915"</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt"> <div class="PlainText">Mixed up exporter and importer here. E.g. while mapping the BO we need<br> to check the importer not the exporter.<br> <br> Signed-off-by: Christian König <christian.koenig@amd.com><br> ---<br> drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 8 +++++---<br> 1 file changed, 5 insertions(+), 3 deletions(-)<br> <br> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c<br> index 1c9991738477..4b584cb75bf4 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c<br> @@ -132,6 +132,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,<br> {<br> struct drm_gem_object *obj = dma_buf->priv;<br> struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);<br> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);<br> long r;<br> <br> r = drm_gem_map_attach(dma_buf, target_dev, attach);<br> @@ -143,7 +144,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,<br> goto error_detach;<br> <br> <br> - if (dma_buf->ops != &amdgpu_dmabuf_ops) {<br> + if (attach->dev->driver != adev->dev->driver) {<br> /*<br> * Wait for all shared fences to complete before we switch to future<br> * use of exclusive fence on this prime shared bo.<br> @@ -162,7 +163,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,<br> if (r)<br> goto error_unreserve;<br> <br> - if (dma_buf->ops != &amdgpu_dmabuf_ops)<br> + if (attach->dev->driver != adev->dev->driver)<br> bo->prime_shared_count++;<br> <br> error_unreserve:<br> @@ -179,6 +180,7 @@ static void amdgpu_gem_map_detach(struct dma_buf *dma_buf,<br> {<br> struct drm_gem_object *obj = dma_buf->priv;<br> struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);<br> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);<br> int ret = 0;<br> <br> ret = amdgpu_bo_reserve(bo, true);<br> @@ -186,7 +188,7 @@ static void amdgpu_gem_map_detach(struct dma_buf *dma_buf,<br> goto error;<br> <br> amdgpu_bo_unpin(bo);<br> - if (dma_buf->ops != &amdgpu_dmabuf_ops && bo->prime_shared_count)<br> + if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count)<br> bo->prime_shared_count--;<br> amdgpu_bo_unreserve(bo);<br> <br> -- <br> 2.14.1<br> <br> _______________________________________________<br> amd-gfx mailing list<br> amd-gfx@lists.freedesktop.org<br> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" id="LPlnk903702" previewremoved="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a> <div id="LPBorder_GT_15216406630550.40395677032215027" style="margin-bottom: 20px; overflow: auto; width: 100%; text-indent: 0px;"> <table id="LPContainer_15216406630500.45676600463241457" style="width: 90%; background-color: rgb(255, 255, 255); position: relative; overflow: auto; padding-top: 20px; padding-bottom: 20px; margin-top: 20px; border-top: 1px dotted rgb(200, 200, 200); border-bottom: 1px dotted rgb(200, 200, 200);" role="presentation" cellspacing="0"> <tbody> <tr style="border-spacing: 0px;" valign="top"> <td id="TextCell_15216406630520.5642112536816963" style="vertical-align: top; position: relative; padding: 0px; display: table-cell;" colspan="2"> <div id="LPRemovePreviewContainer_15216406630520.0327274396367363"></div> <div id="LPTitle_15216406630520.49192658759780994" style="top: 0px; color: rgb(0, 120, 215); font-weight: 400; font-size: 21px; font-family: "wf_segoe-ui_light", "Segoe UI Light", "Segoe WP Light", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; line-height: 21px;"> <a id="LPUrlAnchor_15216406630530.7865030334449444" style="text-decoration: none;" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank">amd-gfx Info Page - freedesktop.org</a></div> <div id="LPMetadata_15216406630540.4842775829210819" style="margin: 10px 0px 16px; color: rgb(102, 102, 102); font-weight: 400; font-family: "wf_segoe-ui_normal", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; font-size: 14px; line-height: 14px;"> lists.freedesktop.org</div> <div id="LPDescription_15216406630540.08773502954535917" style="display: block; color: rgb(102, 102, 102); font-weight: 400; font-family: "wf_segoe-ui_normal", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; font-size: 14px; line-height: 20px; max-height: 100px; overflow: hidden;"> Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. Use of all freedesktop.org lists is subject to our Code of ...</div> </td> </tr> </tbody> </table> </div> <br> </div> </span></font></div> </div> </body> </html>