From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27EF1C433DF for ; Mon, 12 Oct 2020 19:14:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D04A1206C1 for ; Mon, 12 Oct 2020 19:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390923AbgJLTOG convert rfc822-to-8bit (ORCPT ); Mon, 12 Oct 2020 15:14:06 -0400 Received: from aposti.net ([89.234.176.197]:44790 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390172AbgJLTOF (ORCPT ); Mon, 12 Oct 2020 15:14:05 -0400 Date: Mon, 12 Oct 2020 21:13:53 +0200 From: Paul Cercueil Subject: Re: [PATCH] drm/ingenic: Fix bad revert To: Daniel Vetter Cc: Stephen Rothwell , Daniel Vetter , Sam Ravnborg , Intel Graphics , DRI , Linux Kernel Mailing List , linux-next@vger.kernel.org Message-Id: <53S3IQ.YMG1AT14NTR93@crapouillou.net> In-Reply-To: <20201012141041.GU438822@phenom.ffwll.local> References: <20201012152452.432c4867@canb.auug.org.au> <20201012102509.10690-1-paul@crapouillou.net> <20201012141041.GU438822@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le lun. 12 oct. 2020 à 16:10, Daniel Vetter a écrit : > On Mon, Oct 12, 2020 at 12:25:09PM +0200, Paul Cercueil wrote: >> Fix a badly reverted commit. The revert commit was cherry-picked >> from >> drm-misc-next to drm-misc-next-fixes, and in the process some >> unrelated >> code was added. >> >> Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap >> GEM buffers cached"" >> Signed-off-by: Paul Cercueil > > Acked-by: Daniel Vetter I applied the patch to drm-misc-next-fixes. Thanks, -Paul > And yes if you use git cherry-pick it'll do a 3 way merge, and > occasionally it's very tricky to resolve that properly. Especially > when > you're not used to it. > > What I tend to do to double check cerry-picks is git show both > commits, > and compare the entire diff line-by-line to make sure I didn't > misplace > anything. > > Another trick is to use the raw patch instead of cherry-pick, since > that > won't do a 3 way merge where you might get confused with other > context and > fun stuff like that. > > Cheers, Daniel >> --- >> drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ---------------- >> 1 file changed, 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c >> b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c >> index 1be1235bd546..a3d1617d7c67 100644 >> --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c >> +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c >> @@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device >> *dev, >> } >> } >> >> -static void ingenic_drm_update_palette(struct ingenic_drm *priv, >> - const struct drm_color_lut *lut) >> -{ >> - unsigned int i; >> - >> - for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) { >> - u16 color = drm_color_lut_extract(lut[i].red, 5) << 11 >> - | drm_color_lut_extract(lut[i].green, 6) << 5 >> - | drm_color_lut_extract(lut[i].blue, 5); >> - >> - priv->dma_hwdescs->palette[i] = color; >> - } >> -} >> - >> static void ingenic_drm_plane_atomic_update(struct drm_plane >> *plane, >> struct drm_plane_state *oldstate) >> { >> @@ -464,8 +450,6 @@ static void >> ingenic_drm_plane_atomic_update(struct drm_plane *plane, >> dma_addr_t addr; >> >> if (state && state->fb) { >> - crtc_state = state->crtc->state; >> - >> addr = drm_fb_cma_get_gem_addr(state->fb, state, 0); >> width = state->src_w >> 16; >> height = state->src_h >> 16; >> -- >> 2.28.0 >> > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch