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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 4FF8EC433E0 for ; Thu, 11 Mar 2021 16:05:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF5A564FE0 for ; Thu, 11 Mar 2021 16:05:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF5A564FE0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 363CD6EE39; Thu, 11 Mar 2021 16:05:04 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F4846EE39 for ; Thu, 11 Mar 2021 16:05:03 +0000 (UTC) IronPort-SDR: SEUXZd98rl9HBoF6bfbbPmTkcxmURxLv1TPnMbQFIapfv2kBl6ggUFlgO1pkNYCngcQOLg0aWQ L27NqR7lWWYQ== X-IronPort-AV: E=McAfee;i="6000,8403,9920"; a="186309139" X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="186309139" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2021 08:05:03 -0800 IronPort-SDR: QZ/xaf3zikFJi+UwuJ8665xdvK/7UncWhwmMent9wwkfwSnoET35R0bURYiHTaUig8CuzF/2AF +dir9Gi9y0rQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,241,1610438400"; d="scan'208";a="377399302" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga007.fm.intel.com with SMTP; 11 Mar 2021 08:04:57 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 11 Mar 2021 18:04:57 +0200 Date: Thu, 11 Mar 2021 18:04:57 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Message-ID: References: <20210310221736.2963264-1-imre.deak@intel.com> <20210310221736.2963264-2-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210310221736.2963264-2-imre.deak@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 01/23] drm/i915: Fix rotation setup during plane HW readout X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Mar 11, 2021 at 12:17:14AM +0200, Imre Deak wrote: > The HW plane state is cleared and inited after we store the rotation to > it, so store it instead to the uapi state to match what we do with all > other plane state until intel_plane_copy_uapi_to_hw_state() is called. Feels a bit backwards. Ideally I'd like the readout to go the other way. But given how this code is atm this is consistent with the rest. Reviewed-by: Ville Syrj=E4l=E4 Looks like we could also nuke the intel_state->uapi.src =3D drm_plane_state_src(plane_state); intel_state->uapi.dst =3D drm_plane_state_dest(plane_state); since intel_plane_copy_uapi_to_hw_state() also does that for us. > = > Rotation for initial FBs is not supported atm, but let's still fix the > plane state setup here. > = > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 5bfc06c46e28..12b54e032bc1 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -2468,11 +2468,11 @@ intel_find_initial_plane_obj(struct intel_crtc *i= ntel_crtc, > return; > = > valid_fb: > - intel_state->hw.rotation =3D plane_config->rotation; > + plane_state->rotation =3D plane_config->rotation; > intel_fill_fb_ggtt_view(&intel_state->view, fb, > - intel_state->hw.rotation); > + plane_state->rotation); > intel_state->color_plane[0].stride =3D > - intel_fb_pitch(fb, 0, intel_state->hw.rotation); > + intel_fb_pitch(fb, 0, plane_state->rotation); > = > __i915_vma_pin(vma); > intel_state->vma =3D i915_vma_get(vma); > -- = > 2.25.1 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx