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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42C07C433F5 for ; Tue, 26 Oct 2021 01:30:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 028F66103B for ; Tue, 26 Oct 2021 01:30:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 028F66103B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZQmKr5DE19JjeZVsUKU1VXQqbYaB5Ave+4t6AOS+OaU=; b=CDl084/0ToNP+l FoN7jnzy8RuvDJtRe0u7KiPrSc+oVIUBa4+lFBQ1KCC9SZ1WNFuH4UOIzhGg4aTaZILVhBxSgji4S J63lQP0OMete83XPUW4kY0/+OKoX1BexLqLfB3y9Ei3ff7C4Pv7EEH5NC74mv+qqqq3yN/NkbzuJJ HrlPYgOGxtRDEAhOoMI5BNzY/r7B9jIR+NPniPLzXl7nyLobctaye4+YIvI2wfDsREEpi+0qAUdCZ umcjJdLVOZky9PtM/BfyRX4KXNA3sXDVRWGjtwiDQ4Q7hJOYspzHcjwUseWglhj7E3XYVoQOY78pQ hC62Mj1qVb5k19vwFYhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfBGr-000R7i-Nj; Tue, 26 Oct 2021 01:28:58 +0000 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfBGo-000R70-4E for linux-arm-kernel@lists.infradead.org; Tue, 26 Oct 2021 01:28:55 +0000 Received: by mail-qt1-x835.google.com with SMTP id r17so12047396qtx.10 for ; Mon, 25 Oct 2021 18:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=hh45oPDn94gNypIm1FQKgEgGeN239lum/jZyUe6g9nY=; b=U2dYK2PV3BxgyM+7d822+Ew8Y5DSy6+gsGjm/wl0fPr+ZF2fi3mJ0IGMLrSZXSuxNn qqBGh9pVxQ6I7KBKWXtlf+3sGcm9y4iSx8uLS5V5/oah9ex0fpysu4UGghJCAM4SYXGJ FM62r0guNt1biyKMGwfkAUDqX9Rw4xGPLTRDnsnSbjv1Oc2Sin0YLjoSptdYRK+xY7JJ Fk7MkGG6yDX9WVesysklP7VAyMb9RG98TFoYnBER2IJElQSEnSwFHiAcxJGIqefMX9AC +Z6JUwys1RyJg30ReZKj0RBpc8k1XZfW8esNdah9WY73zuLQpGoqqbHm8WPXl0SZviKp jzEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=hh45oPDn94gNypIm1FQKgEgGeN239lum/jZyUe6g9nY=; b=AzJkOkfN5Q0ZQh8XPGYH199fejshf2/labU2V56QoTXJhxVCt/WYpFXwG/KxveBCNK TP0054c68w6kgJtbG+telCzgCJIy3v9ZC666yOEvt1qJd5pFWHtSbH4DCOjb7BQALBXi WGPGzTBUEtwrAUIMWGavuD2IDE6nR4ypXXgixF9I2BvTfkOGfr3oYnS0R2PqWRaMiEMs FxMOfXRHB5rVGf3bYL9XemW6zXiw0uqDqSUjsBFxx8k+QtdoTP24SFxMnUcDLbtOUZdt yMRmlIuplXr7BFnV6YYYw9+YXb5ZLmI3jyTuuumKB/OataBrkMM0t0GN/pNq/WKVP8vf Jj+Q== X-Gm-Message-State: AOAM530TXWNOYwPNPQDZlKTX+GaXFZznvXlGvaOX9EJLb/Wp6CSZIJU6 9OtycrG89rcUQsIDxcYoJe+Rqj9xk6M= X-Google-Smtp-Source: ABdhPJw79deyD9lBHGmREWUAqpL3YQFMBNdQygVadCb4kqmWCWsyXxVF3unQOWHfWut9doYx00CuoQ== X-Received: by 2002:a05:622a:199c:: with SMTP id u28mr21723399qtc.153.1635211733222; Mon, 25 Oct 2021 18:28:53 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id b8sm9463851qtr.82.2021.10.25.18.28.52 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Oct 2021 18:28:52 -0700 (PDT) Date: Mon, 25 Oct 2021 21:28:51 -0400 From: Sean Paul To: Mark Yacoub Cc: linux-mediatek@lists.infradead.org, seanpaul@chromium.org, Mark Yacoub , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/mediatek: Set Rotation default value to 1. Message-ID: <20211026012851.GH2515@art_vandelay> References: <20211022165409.178281-1-markyacoub@chromium.org> <20211026011154.GE2515@art_vandelay> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211026011154.GE2515@art_vandelay> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211025_182854_194031_18348C08 X-CRM114-Status: GOOD ( 33.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 25, 2021 at 09:11:54PM -0400, Sean Paul wrote: > On Fri, Oct 22, 2021 at 12:54:02PM -0400, Mark Yacoub wrote: > > From: Mark Yacoub > > > > [Why] > > The Rotation prob is a bitmask value. It must always have a valid value. > > nit: s/prob/prop/ > > > A default NO rotation is equal to 1 not 0. > > > > [How] > > 1. At the reset hook, call __drm_atomic_helper_plane_reset which is > > called at the initialization of the plane and sets the default value of > > all planes to DRM_MODE_ROTATE_0 which is equal to 1. > > 2. At the ovl layer check, do no overwrite the state->rotation value 0 > > if DRM_MODE_ROTATE_0 is set. We should not change the value that the > > userspace has set, especially if it's an unsupported value. > > nit: I would probably split these into 2 patches since they're related but > different Did you decide not to remove the default value from the plane rotation value? I still think we should do that. Sean > > Sean > > > > > Tested on Jacuzzi(MTK). > > Fixes IGT@kms_properties@plane-properties-{legacy,atomic} and > > IGT@kms_properties@get_properties-sanity-{atomic,non-atomic} > > > > Signed-off-by: Mark Yacoub > > --- > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 20 +++++++------------- > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 5 ++--- > > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 3 ++- > > 4 files changed, 12 insertions(+), 18 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index 86c3068894b11..2fc566964f68e 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -64,7 +64,7 @@ void mtk_ovl_config(struct device *dev, unsigned int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > int mtk_ovl_layer_check(struct device *dev, unsigned int idx, > > - struct mtk_plane_state *mtk_state); > > + const struct mtk_plane_state *mtk_state); > > void mtk_ovl_layer_config(struct device *dev, unsigned int idx, > > struct mtk_plane_state *state, > > struct cmdq_pkt *cmdq_pkt); > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > index ea5760f856ec6..13999564304bc 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > @@ -190,19 +190,15 @@ unsigned int mtk_ovl_supported_rotations(struct device *dev) > > } > > > > int mtk_ovl_layer_check(struct device *dev, unsigned int idx, > > - struct mtk_plane_state *mtk_state) > > + const struct mtk_plane_state *mtk_state) > > { > > - struct drm_plane_state *state = &mtk_state->base; > > - unsigned int rotation = 0; > > + const struct drm_plane_state *state = &mtk_state->base; > > + unsigned int rotation = drm_rotation_simplify( > > + state->rotation, > > + DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); > > > > - rotation = drm_rotation_simplify(state->rotation, > > - DRM_MODE_ROTATE_0 | > > - DRM_MODE_REFLECT_X | > > - DRM_MODE_REFLECT_Y); > > - rotation &= ~DRM_MODE_ROTATE_0; > > - > > - /* We can only do reflection, not rotation */ > > - if ((rotation & DRM_MODE_ROTATE_MASK) != 0) > > + /* We can only do reflection, not non-zero rotation */ > > + if (((rotation & ~DRM_MODE_ROTATE_0) & DRM_MODE_ROTATE_MASK) != 0) > > return -EINVAL; > > > > /* > > @@ -212,8 +208,6 @@ int mtk_ovl_layer_check(struct device *dev, unsigned int idx, > > if (state->fb->format->is_yuv && rotation != 0) > > return -EINVAL; > > > > - state->rotation = rotation; > > - > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > index 1b582262b682b..530bdd031933f 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > @@ -53,9 +53,8 @@ struct mtk_ddp_comp_funcs { > > void (*disable_vblank)(struct device *dev); > > unsigned int (*supported_rotations)(struct device *dev); > > unsigned int (*layer_nr)(struct device *dev); > > - int (*layer_check)(struct device *dev, > > - unsigned int idx, > > - struct mtk_plane_state *state); > > + int (*layer_check)(struct device *dev, unsigned int idx, > > + const struct mtk_plane_state *state); > > void (*layer_config)(struct device *dev, unsigned int idx, > > struct mtk_plane_state *state, > > struct cmdq_pkt *cmdq_pkt); > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > index e6dcb34d30522..accd26481b9fb 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > @@ -44,9 +44,10 @@ static void mtk_plane_reset(struct drm_plane *plane) > > state = kzalloc(sizeof(*state), GFP_KERNEL); > > if (!state) > > return; > > - plane->state = &state->base; > > } > > > > + __drm_atomic_helper_plane_reset(plane, &state->base); > > + > > state->base.plane = plane; > > state->pending.format = DRM_FORMAT_RGB565; > > } > > -- > > 2.33.0.1079.g6e70778dc9-goog > > > > -- > Sean Paul, Software Engineer, Google / Chromium OS -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel