xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 64bd009d17986c71726724859f100ad40a6e3096
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jul 19 11:33:42 2018 +0200

    Don't allocate drmmode_output->props twice
    
    This was accidentally duplicated when porting RandR lease support from
    amdgpu.
    
    Trivial.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2af64e3f..000c7fc6 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1666,11 +1666,6 @@ drmmode_output_create_resources(xf86OutputPtr output)
 	}
     }
 
-    drmmode_output->props =
-	calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec));
-    if (!drmmode_output->props)
-	return;
-
     drmmode_output->props = calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec));
     if (!drmmode_output->props)
 	return;