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 99990C433E1 for ; Wed, 19 Aug 2020 08:14:17 +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 7AF1C2067C for ; Wed, 19 Aug 2020 08:14:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AF1C2067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 E32846E1F1; Wed, 19 Aug 2020 08:14:12 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 456296E171; Wed, 19 Aug 2020 08:14:11 +0000 (UTC) IronPort-SDR: OCsiCs3a8MigoMMxc8FgRUmaxUxiz030CuuVZi6XFVcZAP1vbnT4TTD/z0guSC5S7BPpEri9HU ST1ivOteYPlg== X-IronPort-AV: E=McAfee;i="6000,8403,9717"; a="156137948" X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="156137948" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2020 01:14:10 -0700 IronPort-SDR: a86V0QJ4SPPHZ9HPwqC46ACMEB/E+JJeqteyZXc1vvxn51mWE4ZmHY5Wta4hNaLWiqheIejCB7 /v6OGfM7K4dw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="400759819" Received: from fmsmsx601-2.cps.intel.com (HELO fmsmsx601.amr.corp.intel.com) ([10.18.84.211]) by fmsmga001.fm.intel.com with ESMTP; 19 Aug 2020 01:14:10 -0700 Received: from bgsmsx602.gar.corp.intel.com (10.109.78.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 19 Aug 2020 01:14:09 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX602.gar.corp.intel.com (10.109.78.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 19 Aug 2020 13:44:06 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Wed, 19 Aug 2020 13:44:05 +0530 From: "Shankar, Uma" To: "Laxminarayan Bharadiya, Pankaj" , "jani.nikula@linux.intel.com" , "daniel@ffwll.ch" , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "ville.syrjala@linux.intel.com" , "daniels@collabora.com" , "Lattannavar, Sameer" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie Thread-Topic: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter properties Thread-Index: AQHWaU9yvTSANYmdI0a6PD1rORUSn6k/LeBQ Date: Wed, 19 Aug 2020 08:14:05 +0000 Message-ID: <386da03e93d94e2b9722aab9cdc8e3eb@intel.com> References: <20200803042953.7626-1-pankaj.laxminarayan.bharadiya@intel.com> <20200803042953.7626-2-pankaj.laxminarayan.bharadiya@intel.com> In-Reply-To: <20200803042953.7626-2-pankaj.laxminarayan.bharadiya@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter properties 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Intel-gfx On Behalf Of Pankaj > Bharadiya > Sent: Monday, August 3, 2020 10:00 AM > To: jani.nikula@linux.intel.com; daniel@ffwll.ch; intel-gfx@lists.freedesktop.org; > dri-devel@lists.freedesktop.org; ville.syrjala@linux.intel.com; > daniels@collabora.com; Lattannavar, Sameer ; > Maarten Lankhorst ; Maxime Ripard > ; Thomas Zimmermann ; David > Airlie > Subject: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter > properties > > Introduce per-plane and per-CRTC scaling filter properties to allow userspace to > select the driver's default scaling filter or > Nearest-neighbor(NN) filter for upscaling operations on CRTC and plane. > > Drivers can set up this property for a plane by calling > drm_plane_create_scaling_filter() and for a CRTC by calling > drm_crtc_create_scaling_filter(). > > NN filter works by filling in the missing color values in the upscaled image with > that of the coordinate-mapped nearest source pixel value. > > NN filter for integer multiple scaling can be particularly useful for for pixel art > games that rely on sharp, blocky images to deliver their distinctive look. > > changes since v3: > * Refactor code, add new function for common code (Ville) changes since v2: > * Create per-plane and per-CRTC scaling filter property (Ville) changes since v1: > * None > changes since RFC: > * Add separate properties for plane and CRTC (Ville) > > Signed-off-by: Pankaj Bharadiya > --- > drivers/gpu/drm/drm_atomic_uapi.c | 8 +++ > drivers/gpu/drm/drm_crtc.c | 48 +++++++++++++++ > drivers/gpu/drm/drm_crtc_internal.h | 3 + > drivers/gpu/drm/drm_plane.c | 90 +++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 16 +++++ > include/drm/drm_plane.h | 21 +++++++ > 6 files changed, 186 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c > b/drivers/gpu/drm/drm_atomic_uapi.c > index 25c269bc4681..ef82009035e6 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -469,6 +469,8 @@ static int drm_atomic_crtc_set_property(struct drm_crtc > *crtc, > return -EFAULT; > > set_out_fence_for_crtc(state->state, crtc, fence_ptr); > + } else if (property == crtc->scaling_filter_property) { > + state->scaling_filter = val; > } else if (crtc->funcs->atomic_set_property) { > return crtc->funcs->atomic_set_property(crtc, state, property, > val); > } else { > @@ -503,6 +505,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, > *val = (state->gamma_lut) ? state->gamma_lut->base.id : 0; > else if (property == config->prop_out_fence_ptr) > *val = 0; > + else if (property == crtc->scaling_filter_property) > + *val = state->scaling_filter; > else if (crtc->funcs->atomic_get_property) > return crtc->funcs->atomic_get_property(crtc, state, property, > val); > else > @@ -585,6 +589,8 @@ static int drm_atomic_plane_set_property(struct > drm_plane *plane, > sizeof(struct drm_rect), > &replaced); > return ret; > + } else if (property == plane->scaling_filter_property) { > + state->scaling_filter = val; > } else if (plane->funcs->atomic_set_property) { > return plane->funcs->atomic_set_property(plane, state, > property, val); > @@ -643,6 +649,8 @@ drm_atomic_plane_get_property(struct drm_plane > *plane, > } else if (property == config->prop_fb_damage_clips) { > *val = (state->fb_damage_clips) ? > state->fb_damage_clips->base.id : 0; > + } else if (property == plane->scaling_filter_property) { > + *val = state->scaling_filter; > } else if (plane->funcs->atomic_get_property) { > return plane->funcs->atomic_get_property(plane, state, > property, val); > } else { > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index > 283bcc4362ca..70f5cd9704ba 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -776,3 +776,51 @@ int drm_mode_crtc_set_obj_prop(struct > drm_mode_object *obj, > > return ret; > } > + > +/** > + * DOC: CRTC scaling filter property > + * > + * SCALING_FILTER: > + * > + * Indicates scaling filter to be used for CRTC scaler > + * > + * The value of this property can be one of the following: > + * Default: > + * Driver's default scaling filter > + * Nearest Neighbor: > + * Nearest Neighbor scaling filter > + * > + * Drivers can set up this property for a CRTC by calling > + * drm_crtc_create_scaling_filter_property > + */ > + > +/** > + * drm_crtc_create_scaling_filter_property - create a new scaling > +filter > + * property > + * > + * @crtc: drm CRTC > + * @supported_filters: bitmask of supported scaling filters, must include > + * BIT(DRM_SCALING_FILTER_DEFAULT). > + * > + * This function lets driver to enable the scaling filter property on a > +given > + * CRTC. > + * > + * RETURNS: > + * Zero for success or -errno > + */ > +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc, > + unsigned int supported_filters) { > + struct drm_property *prop = > + drm_create_scaling_filter_prop(crtc->dev, supported_filters); > + > + if (IS_ERR(prop)) > + return PTR_ERR(prop); > + > + drm_object_attach_property(&crtc->base, prop, > + DRM_SCALING_FILTER_DEFAULT); > + crtc->scaling_filter_property = prop; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_crtc_create_scaling_filter_property); > diff --git a/drivers/gpu/drm/drm_crtc_internal.h > b/drivers/gpu/drm/drm_crtc_internal.h > index da96b2f64d7e..54d4cf1233e9 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -72,6 +72,9 @@ int drm_crtc_force_disable(struct drm_crtc *crtc); > > struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc); > > +struct drm_property * > +drm_create_scaling_filter_prop(struct drm_device *dev, > + unsigned int supported_filters); > /* IOCTLs */ > int drm_mode_getcrtc(struct drm_device *dev, > void *data, struct drm_file *file_priv); diff --git > a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index > b7b90b3a2e38..de3888572684 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -1231,3 +1231,93 @@ int drm_mode_page_flip_ioctl(struct drm_device > *dev, > > return ret; > } > + > +struct drm_property * > +drm_create_scaling_filter_prop(struct drm_device *dev, > + unsigned int supported_filters) { This property is used generically by crtc and plane. Can we move this function outside the plane file to a more generic location. We could use drm_mode_config.c for instance. Other than this, it looks good to me. Reviewed-by: Uma Shankar > + struct drm_property *prop; > + static const struct drm_prop_enum_list props[] = { > + { DRM_SCALING_FILTER_DEFAULT, "Default" }, > + { DRM_SCALING_FILTER_NEAREST_NEIGHBOR, "Nearest > Neighbor" }, > + }; > + unsigned int valid_mode_mask = BIT(DRM_SCALING_FILTER_DEFAULT) | > + > BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR); > + int i; > + > + if (WARN_ON((supported_filters & ~valid_mode_mask) || > + ((supported_filters & BIT(DRM_SCALING_FILTER_DEFAULT)) == > 0))) > + return ERR_PTR(-EINVAL); > + > + prop = drm_property_create(dev, DRM_MODE_PROP_ENUM, > + "SCALING_FILTER", > + hweight32(supported_filters)); > + if (!prop) > + return ERR_PTR(-ENOMEM); > + > + for (i = 0; i < ARRAY_SIZE(props); i++) { > + int ret; > + > + if (!(BIT(props[i].type) & supported_filters)) > + continue; > + > + ret = drm_property_add_enum(prop, props[i].type, > + props[i].name); > + > + if (ret) { > + drm_property_destroy(dev, prop); > + > + return ERR_PTR(ret); > + } > + } > + > + return prop; > +} > + > +/** > + * DOC: Plane scaling filter property > + * > + * SCALING_FILTER: > + * > + * Indicates scaling filter to be used for plane scaler > + * > + * The value of this property can be one of the following: > + * Default: > + * Driver's default scaling filter > + * Nearest Neighbor: > + * Nearest Neighbor scaling filter > + * > + * Drivers can set up this property for a plane by calling > + * drm_plane_create_scaling_filter_property > + */ > + > +/** > + * drm_plane_create_scaling_filter_property - create a new scaling > +filter > + * property > + * > + * @plane: drm plane > + * @supported_filters: bitmask of supported scaling filters, must include > + * BIT(DRM_SCALING_FILTER_DEFAULT). > + * > + * This function lets driver to enable the scaling filter property on a > +given > + * plane. > + * > + * RETURNS: > + * Zero for success or -errno > + */ > +int drm_plane_create_scaling_filter_property(struct drm_plane *plane, > + unsigned int supported_filters) { > + struct drm_property *prop = > + drm_create_scaling_filter_prop(plane->dev, supported_filters); > + > + if (IS_ERR(prop)) > + return PTR_ERR(prop); > + > + drm_object_attach_property(&plane->base, prop, > + DRM_SCALING_FILTER_DEFAULT); > + plane->scaling_filter_property = prop; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_plane_create_scaling_filter_property); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index > 59b51a09cae6..ba839e5e357d 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -324,6 +324,13 @@ struct drm_crtc_state { > */ > bool self_refresh_active; > > + /** > + * @scaling_filter: > + * > + * Scaling filter to be applied > + */ > + enum drm_scaling_filter scaling_filter; > + > /** > * @event: > * > @@ -1083,6 +1090,12 @@ struct drm_crtc { > /** @properties: property tracking for this CRTC */ > struct drm_object_properties properties; > > + /** > + * @scaling_filter_property: property to apply a particular filter while > + * scaling. > + */ > + struct drm_property *scaling_filter_property; > + > /** > * @state: > * > @@ -1266,4 +1279,7 @@ static inline struct drm_crtc *drm_crtc_find(struct > drm_device *dev, #define drm_for_each_crtc(crtc, dev) \ > list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) > > +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc, > + unsigned int supported_filters); > + > #endif /* __DRM_CRTC_H__ */ > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index > 3f396d94afe4..1d82b264e5e4 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -35,6 +35,11 @@ struct drm_crtc; > struct drm_printer; > struct drm_modeset_acquire_ctx; > > +enum drm_scaling_filter { > + DRM_SCALING_FILTER_DEFAULT, > + DRM_SCALING_FILTER_NEAREST_NEIGHBOR, > +}; > + > /** > * struct drm_plane_state - mutable plane state > * > @@ -214,6 +219,13 @@ struct drm_plane_state { > */ > bool visible; > > + /** > + * @scaling_filter: > + * > + * Scaling filter to be applied > + */ > + enum drm_scaling_filter scaling_filter; > + > /** > * @commit: Tracks the pending commit to prevent use-after-free > conditions, > * and for async plane updates. > @@ -724,6 +736,12 @@ struct drm_plane { > * See drm_plane_create_color_properties(). > */ > struct drm_property *color_range_property; > + > + /** > + * @scaling_filter_property: property to apply a particular filter while > + * scaling. > + */ > + struct drm_property *scaling_filter_property; > }; > > #define obj_to_plane(x) container_of(x, struct drm_plane, base) @@ -862,4 > +880,7 @@ drm_plane_get_damage_clips(const struct drm_plane_state *state) > state->fb_damage_clips->data : NULL); } > > +int drm_plane_create_scaling_filter_property(struct drm_plane *plane, > + unsigned int supported_filters); > + > #endif > -- > 2.23.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx 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=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 3440CC433DF for ; Wed, 19 Aug 2020 08:14:13 +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 0F6632067C for ; Wed, 19 Aug 2020 08:14:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F6632067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64FD06E171; Wed, 19 Aug 2020 08:14:12 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 456296E171; Wed, 19 Aug 2020 08:14:11 +0000 (UTC) IronPort-SDR: OCsiCs3a8MigoMMxc8FgRUmaxUxiz030CuuVZi6XFVcZAP1vbnT4TTD/z0guSC5S7BPpEri9HU ST1ivOteYPlg== X-IronPort-AV: E=McAfee;i="6000,8403,9717"; a="156137948" X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="156137948" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2020 01:14:10 -0700 IronPort-SDR: a86V0QJ4SPPHZ9HPwqC46ACMEB/E+JJeqteyZXc1vvxn51mWE4ZmHY5Wta4hNaLWiqheIejCB7 /v6OGfM7K4dw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="400759819" Received: from fmsmsx601-2.cps.intel.com (HELO fmsmsx601.amr.corp.intel.com) ([10.18.84.211]) by fmsmga001.fm.intel.com with ESMTP; 19 Aug 2020 01:14:10 -0700 Received: from bgsmsx602.gar.corp.intel.com (10.109.78.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 19 Aug 2020 01:14:09 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX602.gar.corp.intel.com (10.109.78.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 19 Aug 2020 13:44:06 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Wed, 19 Aug 2020 13:44:05 +0530 From: "Shankar, Uma" To: "Laxminarayan Bharadiya, Pankaj" , "jani.nikula@linux.intel.com" , "daniel@ffwll.ch" , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "ville.syrjala@linux.intel.com" , "daniels@collabora.com" , "Lattannavar, Sameer" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie Subject: RE: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter properties Thread-Topic: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter properties Thread-Index: AQHWaU9yvTSANYmdI0a6PD1rORUSn6k/LeBQ Date: Wed, 19 Aug 2020 08:14:05 +0000 Message-ID: <386da03e93d94e2b9722aab9cdc8e3eb@intel.com> References: <20200803042953.7626-1-pankaj.laxminarayan.bharadiya@intel.com> <20200803042953.7626-2-pankaj.laxminarayan.bharadiya@intel.com> In-Reply-To: <20200803042953.7626-2-pankaj.laxminarayan.bharadiya@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" > -----Original Message----- > From: Intel-gfx On Behalf Of Pankaj > Bharadiya > Sent: Monday, August 3, 2020 10:00 AM > To: jani.nikula@linux.intel.com; daniel@ffwll.ch; intel-gfx@lists.freedesktop.org; > dri-devel@lists.freedesktop.org; ville.syrjala@linux.intel.com; > daniels@collabora.com; Lattannavar, Sameer ; > Maarten Lankhorst ; Maxime Ripard > ; Thomas Zimmermann ; David > Airlie > Subject: [Intel-gfx] [PATCH v5 1/5] drm: Introduce plane and CRTC scaling filter > properties > > Introduce per-plane and per-CRTC scaling filter properties to allow userspace to > select the driver's default scaling filter or > Nearest-neighbor(NN) filter for upscaling operations on CRTC and plane. > > Drivers can set up this property for a plane by calling > drm_plane_create_scaling_filter() and for a CRTC by calling > drm_crtc_create_scaling_filter(). > > NN filter works by filling in the missing color values in the upscaled image with > that of the coordinate-mapped nearest source pixel value. > > NN filter for integer multiple scaling can be particularly useful for for pixel art > games that rely on sharp, blocky images to deliver their distinctive look. > > changes since v3: > * Refactor code, add new function for common code (Ville) changes since v2: > * Create per-plane and per-CRTC scaling filter property (Ville) changes since v1: > * None > changes since RFC: > * Add separate properties for plane and CRTC (Ville) > > Signed-off-by: Pankaj Bharadiya > --- > drivers/gpu/drm/drm_atomic_uapi.c | 8 +++ > drivers/gpu/drm/drm_crtc.c | 48 +++++++++++++++ > drivers/gpu/drm/drm_crtc_internal.h | 3 + > drivers/gpu/drm/drm_plane.c | 90 +++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 16 +++++ > include/drm/drm_plane.h | 21 +++++++ > 6 files changed, 186 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c > b/drivers/gpu/drm/drm_atomic_uapi.c > index 25c269bc4681..ef82009035e6 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -469,6 +469,8 @@ static int drm_atomic_crtc_set_property(struct drm_crtc > *crtc, > return -EFAULT; > > set_out_fence_for_crtc(state->state, crtc, fence_ptr); > + } else if (property == crtc->scaling_filter_property) { > + state->scaling_filter = val; > } else if (crtc->funcs->atomic_set_property) { > return crtc->funcs->atomic_set_property(crtc, state, property, > val); > } else { > @@ -503,6 +505,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, > *val = (state->gamma_lut) ? state->gamma_lut->base.id : 0; > else if (property == config->prop_out_fence_ptr) > *val = 0; > + else if (property == crtc->scaling_filter_property) > + *val = state->scaling_filter; > else if (crtc->funcs->atomic_get_property) > return crtc->funcs->atomic_get_property(crtc, state, property, > val); > else > @@ -585,6 +589,8 @@ static int drm_atomic_plane_set_property(struct > drm_plane *plane, > sizeof(struct drm_rect), > &replaced); > return ret; > + } else if (property == plane->scaling_filter_property) { > + state->scaling_filter = val; > } else if (plane->funcs->atomic_set_property) { > return plane->funcs->atomic_set_property(plane, state, > property, val); > @@ -643,6 +649,8 @@ drm_atomic_plane_get_property(struct drm_plane > *plane, > } else if (property == config->prop_fb_damage_clips) { > *val = (state->fb_damage_clips) ? > state->fb_damage_clips->base.id : 0; > + } else if (property == plane->scaling_filter_property) { > + *val = state->scaling_filter; > } else if (plane->funcs->atomic_get_property) { > return plane->funcs->atomic_get_property(plane, state, > property, val); > } else { > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index > 283bcc4362ca..70f5cd9704ba 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -776,3 +776,51 @@ int drm_mode_crtc_set_obj_prop(struct > drm_mode_object *obj, > > return ret; > } > + > +/** > + * DOC: CRTC scaling filter property > + * > + * SCALING_FILTER: > + * > + * Indicates scaling filter to be used for CRTC scaler > + * > + * The value of this property can be one of the following: > + * Default: > + * Driver's default scaling filter > + * Nearest Neighbor: > + * Nearest Neighbor scaling filter > + * > + * Drivers can set up this property for a CRTC by calling > + * drm_crtc_create_scaling_filter_property > + */ > + > +/** > + * drm_crtc_create_scaling_filter_property - create a new scaling > +filter > + * property > + * > + * @crtc: drm CRTC > + * @supported_filters: bitmask of supported scaling filters, must include > + * BIT(DRM_SCALING_FILTER_DEFAULT). > + * > + * This function lets driver to enable the scaling filter property on a > +given > + * CRTC. > + * > + * RETURNS: > + * Zero for success or -errno > + */ > +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc, > + unsigned int supported_filters) { > + struct drm_property *prop = > + drm_create_scaling_filter_prop(crtc->dev, supported_filters); > + > + if (IS_ERR(prop)) > + return PTR_ERR(prop); > + > + drm_object_attach_property(&crtc->base, prop, > + DRM_SCALING_FILTER_DEFAULT); > + crtc->scaling_filter_property = prop; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_crtc_create_scaling_filter_property); > diff --git a/drivers/gpu/drm/drm_crtc_internal.h > b/drivers/gpu/drm/drm_crtc_internal.h > index da96b2f64d7e..54d4cf1233e9 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -72,6 +72,9 @@ int drm_crtc_force_disable(struct drm_crtc *crtc); > > struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc); > > +struct drm_property * > +drm_create_scaling_filter_prop(struct drm_device *dev, > + unsigned int supported_filters); > /* IOCTLs */ > int drm_mode_getcrtc(struct drm_device *dev, > void *data, struct drm_file *file_priv); diff --git > a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index > b7b90b3a2e38..de3888572684 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -1231,3 +1231,93 @@ int drm_mode_page_flip_ioctl(struct drm_device > *dev, > > return ret; > } > + > +struct drm_property * > +drm_create_scaling_filter_prop(struct drm_device *dev, > + unsigned int supported_filters) { This property is used generically by crtc and plane. Can we move this function outside the plane file to a more generic location. We could use drm_mode_config.c for instance. Other than this, it looks good to me. Reviewed-by: Uma Shankar > + struct drm_property *prop; > + static const struct drm_prop_enum_list props[] = { > + { DRM_SCALING_FILTER_DEFAULT, "Default" }, > + { DRM_SCALING_FILTER_NEAREST_NEIGHBOR, "Nearest > Neighbor" }, > + }; > + unsigned int valid_mode_mask = BIT(DRM_SCALING_FILTER_DEFAULT) | > + > BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR); > + int i; > + > + if (WARN_ON((supported_filters & ~valid_mode_mask) || > + ((supported_filters & BIT(DRM_SCALING_FILTER_DEFAULT)) == > 0))) > + return ERR_PTR(-EINVAL); > + > + prop = drm_property_create(dev, DRM_MODE_PROP_ENUM, > + "SCALING_FILTER", > + hweight32(supported_filters)); > + if (!prop) > + return ERR_PTR(-ENOMEM); > + > + for (i = 0; i < ARRAY_SIZE(props); i++) { > + int ret; > + > + if (!(BIT(props[i].type) & supported_filters)) > + continue; > + > + ret = drm_property_add_enum(prop, props[i].type, > + props[i].name); > + > + if (ret) { > + drm_property_destroy(dev, prop); > + > + return ERR_PTR(ret); > + } > + } > + > + return prop; > +} > + > +/** > + * DOC: Plane scaling filter property > + * > + * SCALING_FILTER: > + * > + * Indicates scaling filter to be used for plane scaler > + * > + * The value of this property can be one of the following: > + * Default: > + * Driver's default scaling filter > + * Nearest Neighbor: > + * Nearest Neighbor scaling filter > + * > + * Drivers can set up this property for a plane by calling > + * drm_plane_create_scaling_filter_property > + */ > + > +/** > + * drm_plane_create_scaling_filter_property - create a new scaling > +filter > + * property > + * > + * @plane: drm plane > + * @supported_filters: bitmask of supported scaling filters, must include > + * BIT(DRM_SCALING_FILTER_DEFAULT). > + * > + * This function lets driver to enable the scaling filter property on a > +given > + * plane. > + * > + * RETURNS: > + * Zero for success or -errno > + */ > +int drm_plane_create_scaling_filter_property(struct drm_plane *plane, > + unsigned int supported_filters) { > + struct drm_property *prop = > + drm_create_scaling_filter_prop(plane->dev, supported_filters); > + > + if (IS_ERR(prop)) > + return PTR_ERR(prop); > + > + drm_object_attach_property(&plane->base, prop, > + DRM_SCALING_FILTER_DEFAULT); > + plane->scaling_filter_property = prop; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_plane_create_scaling_filter_property); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index > 59b51a09cae6..ba839e5e357d 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -324,6 +324,13 @@ struct drm_crtc_state { > */ > bool self_refresh_active; > > + /** > + * @scaling_filter: > + * > + * Scaling filter to be applied > + */ > + enum drm_scaling_filter scaling_filter; > + > /** > * @event: > * > @@ -1083,6 +1090,12 @@ struct drm_crtc { > /** @properties: property tracking for this CRTC */ > struct drm_object_properties properties; > > + /** > + * @scaling_filter_property: property to apply a particular filter while > + * scaling. > + */ > + struct drm_property *scaling_filter_property; > + > /** > * @state: > * > @@ -1266,4 +1279,7 @@ static inline struct drm_crtc *drm_crtc_find(struct > drm_device *dev, #define drm_for_each_crtc(crtc, dev) \ > list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) > > +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc, > + unsigned int supported_filters); > + > #endif /* __DRM_CRTC_H__ */ > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index > 3f396d94afe4..1d82b264e5e4 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -35,6 +35,11 @@ struct drm_crtc; > struct drm_printer; > struct drm_modeset_acquire_ctx; > > +enum drm_scaling_filter { > + DRM_SCALING_FILTER_DEFAULT, > + DRM_SCALING_FILTER_NEAREST_NEIGHBOR, > +}; > + > /** > * struct drm_plane_state - mutable plane state > * > @@ -214,6 +219,13 @@ struct drm_plane_state { > */ > bool visible; > > + /** > + * @scaling_filter: > + * > + * Scaling filter to be applied > + */ > + enum drm_scaling_filter scaling_filter; > + > /** > * @commit: Tracks the pending commit to prevent use-after-free > conditions, > * and for async plane updates. > @@ -724,6 +736,12 @@ struct drm_plane { > * See drm_plane_create_color_properties(). > */ > struct drm_property *color_range_property; > + > + /** > + * @scaling_filter_property: property to apply a particular filter while > + * scaling. > + */ > + struct drm_property *scaling_filter_property; > }; > > #define obj_to_plane(x) container_of(x, struct drm_plane, base) @@ -862,4 > +880,7 @@ drm_plane_get_damage_clips(const struct drm_plane_state *state) > state->fb_damage_clips->data : NULL); } > > +int drm_plane_create_scaling_filter_property(struct drm_plane *plane, > + unsigned int supported_filters); > + > #endif > -- > 2.23.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel