It's basically the commit your 2nd patch in this SR here is reverting

Oops, just find maga2000 and matrox are the same devices. But if upstream already has those lines, the old patch should be dropped anyway.

For the reason why the 2nd patch is reverting them, see https://bugzilla.opensuse.org/show_bug.cgi?id=1219507.

And I am figuring out whether we could directly revert them in upstream.

right - which is what I meant by

That part seems obvious - especially as upstream disabled it already themselves - meaning we have it double disabled (so patch not needed, even if we want to keep matrix disabled) -> maybe adjust the wording accordingly?

i.e we should change the wording here to imply that this is fixed by upstream and the patch thus no longer needed (even though it still applies)

OK, I could create a new SR tomorrow for only dropping that patch, and leave the 2nd patch later for upstream.

I'll create that change (dropping first patch) for you in G:Factory; Take your evening off :)

For reference: sr#1148625