drm: Branch 'master'

 amdgpu/amdgpu_asic_id.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57d3d4c96887cde016fe1d2766196accf77ca423
Author: Michel Dänzer <[email protected]>
Date:   Mon Jan 8 11:20:25 2018 +0100

    amdgpu: Don't print error message if parse_one_line returned -EAGAIN
    
    It means it just didn't find an entry for the GPU in the amdgpu.ids file.
    
    Fixes spurious
    
     amdgpu_parse_asic_ids: Cannot parse ASIC IDs: Resource temporarily unavailable
    
    error messages in that case.
    
    Reported-by: Marek Olšák <[email protected]>
    Reviewed-by: Marek Olšák <[email protected]>

diff --git a/amdgpu/amdgpu_asic_id.c b/amdgpu/amdgpu_asic_id.c
index 0c8925e5..62459c09 100644
--- a/amdgpu/amdgpu_asic_id.c
+++ b/amdgpu/amdgpu_asic_id.c
@@ -155,7 +155,7 @@ void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
 	if (r == -EINVAL) {
 		fprintf(stderr, "Invalid format: %s: line %d: %s\n",
 			AMDGPU_ASIC_ID_TABLE, line_num, line);
-	} else if (r) {
+	} else if (r && r != -EAGAIN) {
 		fprintf(stderr, "%s: Cannot parse ASIC IDs: %s\n",
 			__func__, strerror(-r));
 	}

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches