On Fri, Dec 01, 2023 at 10:20:40AM -0500, Harry Wentland wrote: > > > On 2023-11-30 06:34, Daniel Vetter wrote: > > On Tue, 28 Nov 2023 at 23:11, Harry Wentland <harry.wentland@xxxxxxx> wrote: > >> > >> On 2023-11-16 14:57, Melissa Wen wrote: > >>> Hello, > >>> > >>> This series extends the current KMS color management API with AMD > >>> driver-specific properties to enhance the color management support on > >>> AMD Steam Deck. The key additions to the color pipeline include: > >>> > >> > >> snip > >> > >>> Melissa Wen (18): > >>> drm/drm_mode_object: increase max objects to accommodate new color > >>> props > >>> drm/drm_property: make replace_property_blob_from_id a DRM helper > >>> drm/drm_plane: track color mgmt changes per plane > >> > >> If all patches are merged through amd-staging-drm-next I worry that > >> conflicts creep in if any code around replace_property_blob_from_id > >> changes in DRM. > >> > >> My plan is to merge DRM patches through drm-misc-next, as well > >> as include them in the amd-staging-drm-next merge. They should then > >> fall out at the next amd-staging-drm-next pull and (hopefully) > >> ensure that there is no conflict. > >> > >> If no objections I'll go ahead with that later this week. > > > > Double-merging tends to be the worst because git doesn't realize the > > commits match, which actually makes the conflicts worse when they > > happen (because the 3-way merge diff gets absolute confused by all the > > changed context and misplaces everything to the max). So please don't, > > _only_ every cherry-pick when a patch in -next is also needed in > > -fixes, and we didn't put it into the right tree. But even that is a > > bit tricky and should only be done by maintainers (using dim > > cherry-pick if it's drm-misc) because the conflicts tend to be bad and > > need to be sorted out with backmerges sooner than later. > > > > For this case merge everything through one tree with the right acks, > > pull to drm-next asap and then backmerge into the other tree. Here > > probably amdgpu-next with drm-misc maintainer acks for the 3 core > > patches. Or if amdgpu-next pull won't come for a while, put them into > > drm-misc-next and just wait a week until it's in drm-next, then > > forward amdgpu-next. > > > > Maxime, Maarten, Thomas, could I get an ACK from you for the three > DRM core patches and an ACK for pulling them through the AMD tree? Acked-by: Maxime Ripard <mripard@xxxxxxxxxx> Maxime
Attachment:
signature.asc
Description: PGP signature
