[git pull] 1.14 randr fixes without ABI breakage

Aaron Plattner aplattner at nvidia.com
Tue Nov 5 19:04:53 CET 2013


Thanks, guys!  I confirmed that the server crashes during startup with 
our driver at commit ad2fa50 and works fine with commit cf684f0.

On 11/04/2013 08:13 PM, Matt Dew wrote:
> Thanks Dave.
>
> merged.
> ad2fa50..cf684f0  server-1.14-branch -> server-1.14-branch
>
> Let me know if this doesn't fix the problem.
>
> Matt
>
>
> On 11/04/2013 08:32 PM, Dave Airlie wrote:
>> Okay as promised and thanks to Aaron catching it I've backported the
>> randr fixes again,
>>
>> this pull request contains a revert of the merge commit then repicking
>> off the fixes across, with the two abi breaks undone.
>>
>> Dave.
>>
>> The following changes since commit ad2fa50b5371f6e71a66d47e73304599c90f9118:
>>
>>    Merge commit 'f98d6cfa0de41cf33e7555342753897c07af84ef' into
>> server-1.14-branch (2013-10-31 23:53:04 -0600)
>>
>> are available in the git repository at:
>>
>>
>>    ssh://people.freedesktop.org/~airlied/xserver
>> server-1.14-randr-fixes-abi-break-fixed
>>
>> for you to fetch changes up to cf684f05180e8b3eb29ca94bbab84abb99f0f578:
>>
>>    randr: deliver Output and Crtc events of attached output providers.
>> (2013-11-05 13:28:21 +1000)
>>
>> ----------------------------------------------------------------
>> Aaron Plattner (1):
>>        xfree86: detach scanout pixmaps when detaching output GPUs
>>
>> Adam Jackson (1):
>>        randr: Fix a copypasta bug in CRTC confinement
>>
>> Dave Airlie (5):
>>        Revert "Merge commit 'f98d6cfa0de41cf33e7555342753897c07af84ef'
>> into server-1.14-branch"
>>        randr: don't directly set changed bits in randr screen
>>        randr: make SetChanged modify the main protocol screen not the gpu screen
>>        randr: only respected changed on the protocol screen
>>        randr: report changes when we disconnect a GPU slave
>>
>> Michal Srb (3):
>>        randr: send RRProviderChangeNotify event (abi unbreak)
>>        randr: send RRResourceChangeNotify event (abi unbreak)
>>        randr: deliver Output and Crtc events of attached output providers.
>>
>>   randr/randrstr.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Aaron


More information about the xorg-devel mailing list