Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "james qian wang (Arm Technology China)" <james.qian.wang@arm.com>
To:     "Lowry Li (Arm Technology China)" <Lowry.Li@arm.com>
CC:     Liviu Dudau <Liviu.Dudau@arm.com>,
        "maarten.lankhorst@linux.intel.com" 
        <maarten.lankhorst@linux.intel.com>,
        "seanpaul@chromium.org" <seanpaul@chromium.org>,
        "airlied@linux.ie" <airlied@linux.ie>,
        Brian Starkey <Brian.Starkey@arm.com>,
        Ayan Halder <Ayan.Halder@arm.com>,
        "Jonathan Chai (Arm Technology China)" <Jonathan.Chai@arm.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "Julien Yin (Arm Technology China)" <Julien.Yin@arm.com>,
        nd <nd@arm.com>
Subject: Re: [v1, 2/2] drm/komeda: Adds limitation check for AFBC wide block
 not support Rot90
Thread-Topic: [v1, 2/2] drm/komeda: Adds limitation check for AFBC wide block
 not support Rot90
Thread-Index: AQHU/yWwv/2RVbNvEkiT5ikdo3a0Fg==
Date:   Tue, 30 Apr 2019 07:24:04 +0000
Message-ID: <20190430072357.GB8277@james-ThinkStation-P300>
References: <1555902945-2877-3-git-send-email-lowry.li@arm.com>
In-Reply-To: <1555902945-2877-3-git-send-email-lowry.li@arm.com>
Accept-Language: en-US
Content-Language: en-US
user-agent: Mutt/1.9.4 (2018-02-28)
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 51a7ebbd-9779-413f-32e2-08d6cd3cd2e2
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020);SRVR:VE1PR08MB4832;
x-ms-traffictypediagnostic: VE1PR08MB4832:
nodisclaimer: True
x-microsoft-antispam-prvs: <VE1PR08MB4832E598E5D71AA83E69436EB33A0@VE1PR08MB4832.eurprd08.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:5236;
x-forefront-prvs: 00235A1EEF
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(7916004)(136003)(366004)(346002)(396003)(39860400002)(376002)(199004)(189003)(6512007)(6486002)(256004)(4326008)(9686003)(71200400001)(71190400001)(5660300002)(7736002)(25786009)(1076003)(97736004)(8936002)(81166006)(81156014)(99286004)(33656002)(53936002)(305945005)(86362001)(6436002)(73956011)(66946007)(8676002)(66476007)(11346002)(486006)(478600001)(476003)(6246003)(66556008)(2906002)(6506007)(386003)(55236004)(102836004)(52116002)(64756008)(229853002)(186003)(6636002)(446003)(68736007)(76176011)(14454004)(6116002)(33716001)(58126008)(54906003)(316002)(66066001)(6862004)(3846002)(26005)(66446008);DIR:OUT;SFP:1101;SCL:1;SRVR:VE1PR08MB4832;H:VE1PR08MB5006.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: arm.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: qgoXVb1+udA0Hbcg5BlL5JR04cl/U52tJW1a7Bm3qf47vGUyqrKk2i++9bn+KIldi2zEdBQO9QJbMTvvrJVijKP1/9QXayBJlhdrMg3iSE5Gp4+iURDAdnEY8kj3oZzOQjIq1TE+ZkLJqIosULOVS7R/qpon/vLTpsGAuSTvJssGYo0zRlcUgvQxiOVm/pP3BWdexQQp5hOdhE6kFRUUa1FhTBpJ9dO4sM1NS+pR8LU/0p1OQ4Us0R24rNHeoWouIugh2muzML1D8JR9v/Vm2e+gHkf3xNZhdhTWzMzukpxyZh7hGvCouyy6pSTPXeiIkRgZt+S/oK6I1C7QEtvxUjh64h+kyBl+J/xWkxm+AinmCxjsg6jVQuJcXT2pdsGnMcu01wIMKg5dtzkHBEGvBmC2+kn1HcCgN/Q+jKAQ7fs=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <C2A6C5C2CA2A284CAD566027B26AF78A@eurprd08.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 51a7ebbd-9779-413f-32e2-08d6cd3cd2e2
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2019 07:24:04.3338
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4832
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Apr 22, 2019 at 03:16:30AM +0000, Lowry Li (Arm Technology China) w=
rote:
> Komeda series hardware doesn't support Rot90 for AFBC wide block. So
> add limitation check to reject it if such configuration has been posted.
>=20
> Signed-off-by: Lowry Li (Arm Technology China) <lowry.li@arm.com>
> ---
>  drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c       | 15 ++++++++++++=
+++
>  .../gpu/drm/arm/display/komeda/komeda_format_caps.c    |  7 ++++++-
>  .../gpu/drm/arm/display/komeda/komeda_format_caps.h    |  8 +++++++-
>  .../gpu/drm/arm/display/komeda/komeda_framebuffer.c    | 18 +++++++++---=
------
>  .../gpu/drm/arm/display/komeda/komeda_framebuffer.h    |  5 +++--
>  .../gpu/drm/arm/display/komeda/komeda_pipeline_state.c |  8 +++++++-
>  drivers/gpu/drm/arm/display/komeda/komeda_plane.c      |  2 +-
>  7 files changed, 48 insertions(+), 15 deletions(-)
>=20
> --=20
> 1.9.1
>=20
> diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c b/drivers/g=
pu/drm/arm/display/komeda/d71/d71_dev.c
> index 34506ef..9603de9 100644
> --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
> +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
> @@ -494,11 +494,26 @@ static int d71_enum_resources(struct komeda_dev *md=
ev)
>  	{__HW_ID(6, 7),	0/*DRM_FORMAT_YUV420_10BIT*/, 1,	RICH,	Rot_ALL_H_V,	LYT=
_NM, AFB_TH},
>  };
> =20
> +static bool d71_format_mod_supported(const struct komeda_format_caps *ca=
ps,
> +				     u32 layer_type, u64 modifier, u32 rot)
> +{
> +	uint64_t layout =3D modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK;
> +
> +	if ((layout =3D=3D AFBC_FORMAT_MOD_BLOCK_SIZE_32x8) &&
> +	    drm_rotation_90_or_270(rot)) {
> +		DRM_DEBUG_ATOMIC("D71 doesn't support ROT90 for WB-AFBC.\n");
> +		return false;
> +	}
> +
> +	return true;
> +}
> +
>  static void d71_init_fmt_tbl(struct komeda_dev *mdev)
>  {
>  	struct komeda_format_caps_table *table =3D &mdev->fmt_tbl;
> =20
>  	table->format_caps =3D d71_format_caps_table;
> +	table->format_mod_supported =3D d71_format_mod_supported;
>  	table->n_formats =3D ARRAY_SIZE(d71_format_caps_table);
>  }
> =20
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c b/dr=
ivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
> index b219514..cd4d9f5 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
> @@ -74,7 +74,8 @@
>  };
> =20
>  bool komeda_format_mod_supported(struct komeda_format_caps_table *table,
> -				 u32 layer_type, u32 fourcc, u64 modifier)
> +				 u32 layer_type, u32 fourcc, u64 modifier,
> +				 u32 rot)
>  {
>  	const struct komeda_format_caps *caps;
> =20
> @@ -85,6 +86,10 @@ bool komeda_format_mod_supported(struct komeda_format_=
caps_table *table,
>  	if (!(caps->supported_layer_types & layer_type))
>  		return false;
> =20
> +	if (table->format_mod_supported)
> +		return table->format_mod_supported(caps, layer_type, modifier,
> +						   rot);
> +
>  	return true;
>  }
> =20
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h b/dr=
ivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
> index 96de22e..381e873 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
> @@ -71,10 +71,15 @@ struct komeda_format_caps {
>   *
>   * @n_formats: the size of format_caps list.
>   * @format_caps: format_caps list.
> + * @format_mod_supported: Optional. Some HW may have special requirement=
s or
> + * limitations which can not be described by format_caps, this func supp=
ly HW
> + * the ability to do the further HW specific check.
>   */
>  struct komeda_format_caps_table {
>  	u32 n_formats;
>  	const struct komeda_format_caps *format_caps;
> +	bool (*format_mod_supported)(const struct komeda_format_caps *caps,
> +				     u32 layer_type, u64 modifier, u32 rot);
>  };
> =20
>  extern u64 komeda_supported_modifiers[];
> @@ -100,6 +105,7 @@ u32 *komeda_get_layer_fourcc_list(struct komeda_forma=
t_caps_table *table,
>  void komeda_put_fourcc_list(u32 *fourcc_list);
> =20
>  bool komeda_format_mod_supported(struct komeda_format_caps_table *table,
> -				 u32 layer_type, u32 fourcc, u64 modifier);
> +				 u32 layer_type, u32 fourcc, u64 modifier,
> +				 u32 rot);
> =20
>  #endif
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/dr=
ivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> index f842c88..d5822a3 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> @@ -239,20 +239,20 @@ struct drm_framebuffer *
>  }
> =20
>  /* if the fb can be supported by a specific layer */
> -bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type)
> +bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type,
> +				  u32 rot)
>  {
>  	struct drm_framebuffer *fb =3D &kfb->base;
>  	struct komeda_dev *mdev =3D fb->dev->dev_private;
> -	const struct komeda_format_caps *caps;
>  	u32 fourcc =3D fb->format->format;
>  	u64 modifier =3D fb->modifier;
> +	bool supported;
> =20
> -	caps =3D komeda_get_format_caps(&mdev->fmt_tbl, fourcc, modifier);
> -	if (!caps)
> -		return false;
> +	supported =3D komeda_format_mod_supported(&mdev->fmt_tbl, layer_type,
> +						fourcc, modifier, rot);
> +	if (!supported)
> +		DRM_DEBUG_ATOMIC("Layer TYPE: %d doesn't support fb FMT: %s.\n",
> +			layer_type, komeda_get_format_name(fourcc, modifier));
> =20
> -	if (!(caps->supported_layer_types & layer_type))
> -		return false;
> -
> -	return true;
> +	return supported;
>  }
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h b/dr=
ivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
> index e3bab0d..6cbb2f6 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
> @@ -35,9 +35,10 @@ struct komeda_fb {
> =20
>  struct drm_framebuffer *
>  komeda_fb_create(struct drm_device *dev, struct drm_file *file,
> -		 const struct drm_mode_fb_cmd2 *mode_cmd);
> +		const struct drm_mode_fb_cmd2 *mode_cmd);
>  dma_addr_t
>  komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane)=
;
> -bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type)=
;
> +bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type,
> +		u32 rot);
> =20
>  #endif
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b=
/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
> index 8c133e4..711dadc 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
> @@ -252,6 +252,11 @@ struct komeda_pipeline_state *
>  		       struct komeda_plane_state *kplane_st,
>  		       struct komeda_data_flow_cfg *dflow)
>  {
> +	struct komeda_fb *kfb =3D to_kfb(kplane_st->base.fb);
> +
> +	if (!komeda_fb_is_layer_supported(kfb, layer->layer_type, dflow->rot))
> +		return -EINVAL;
> +
>  	if (!in_range(&layer->hsize_in, dflow->in_w)) {
>  		DRM_DEBUG_ATOMIC("src_w: %d is out of range.\n", dflow->in_w);
>  		return -EINVAL;
> @@ -337,7 +342,8 @@ struct komeda_pipeline_state *
>  	struct komeda_layer_state *st;
>  	int i;
> =20
> -	if (!komeda_fb_is_layer_supported(kfb, wb_layer->layer_type))
> +	if (!komeda_fb_is_layer_supported(kfb, wb_layer->layer_type,
> +					  dflow->rot))
>  		return -EINVAL;
> =20
>  	c_st =3D komeda_component_get_state_and_set_user(&wb_layer->base,
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/=
gpu/drm/arm/display/komeda/komeda_plane.c
> index 5e5bfdb..aae6fe6 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
> @@ -170,7 +170,7 @@ static void komeda_plane_reset(struct drm_plane *plan=
e)
>  	u32 layer_type =3D kplane->layer->layer_type;
> =20
>  	return komeda_format_mod_supported(&mdev->fmt_tbl, layer_type,
> -					   format, modifier);
> +					   format, modifier, 0);
>  }
> =20
>  static const struct drm_plane_funcs komeda_plane_funcs =3D {

looks good to me.

James
--=20
Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.co=
m>