Hi Hans, On Mon, Jan 04, 2021 at 02:24:27PM +0100, Hans de Goede wrote: > > Dmitry, once I have a patch ready to move the goodix rotated_screen > and inverted_x_screen DMI quirk tables to platform/drivers/x86/touchscreen_dmi.c > where all other (x86) touchscreen quirks have been gathered so far, the question > becomes how to merge that patch ? > > I see 2 options: > > 1. Have 2 separate patches, one adding the quirks to > platform/drivers/x86/touchscreen_dmi.c and a second patch removing the > DMI tables (and the code handling them) from goodix.c. And then merge > them through the pdx86 resp. the input tree. > > 2. Have 1 big patch doing both. > > The downside of 1. is that there might be a point in git history where > the coordinates of the touchscreens regress. Depending on which pull-req > lands first (if the pdx86 pull-req for 5.12-rc1 gets merged first there > is no issue). But only when git-bisecting so I think that 1. is best to > avoid any merge issues. At least platform/drivers/x86/touchscreen_dmi.c > sees a lot of activity every cycle. So another option would be to > do 1 big patch and then merge that through the pdx86 tree (I can provide > an immutable branch for that). > > Dmitry if you can let me know which way you would prefer to move forward > with this then I can prepare the 1 or 2 patches (once I hear back from the > "Cube I15-TC" quirk patch author). I am fine with a single patch going through either platform or input tree. We could even have an immutable branch off 5.10 and merge it into both trees to ensure there are no clashes. Thanks. -- Dmitry
