[PATCH 1/4] drm: Make syncobj import/export functions static

[PATCH 1/4] drm: Make syncobj import/export functions static

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Fix the following sparse warnings by making functions static:
drm_syncobj.c:420:5: warning: symbol 'drm_syncobj_import_sync_file_fence' was not declared. Should it be static?
drm_syncobj.c:441:5: warning: symbol 'drm_syncobj_export_sync_file' was not declared. Should it be static?

Cc: Dave Airlie <airlied@redhat.com>
Fixes: 3ee45a3b533a ("drm/syncobj: add sync_file interaction. (v1.2)")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_syncobj.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 0422b8c2c2e7..26d60615b4d4 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -417,8 +417,8 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,
 	return 0;
 }
 
-int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
-				       int fd, int handle)
+static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
+					      int fd, int handle)
 {
 	struct dma_fence *fence = sync_file_get_fence(fd);
 	struct drm_syncobj *syncobj;
@@ -438,8 +438,8 @@ int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
 	return 0;
 }
 
-int drm_syncobj_export_sync_file(struct drm_file *file_private,
-				 int handle, int *p_fd)
+static int drm_syncobj_export_sync_file(struct drm_file *file_private,
+					int handle, int *p_fd)
 {
 	int ret;
 	struct dma_fence *fence;
-- 
2.13.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/4] drm: Add missing __user annotation to drm_syncobj_array_find()

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

'user_handles' needs a __user annotation for fix the following sparse
warning:
drm_syncobj.c:813:37: warning: incorrect type in argument 2 (different address spaces)
drm_syncobj.c:813:37:    expected void const [noderef] <asn:1>*from
drm_syncobj.c:813:37:    got void *user_handles
drm_syncobj.c:875:38: warning: incorrect type in argument 2 (different address spaces)
drm_syncobj.c:875:38:    expected void *user_handles
drm_syncobj.c:875:38:    got void [noderef] <asn:1>*<noident>
drm_syncobj.c:908:38: warning: incorrect type in argument 2 (different address spaces)
drm_syncobj.c:908:38:    expected void *user_handles
drm_syncobj.c:908:38:    got void [noderef] <asn:1>*<noident>
drm_syncobj.c:941:38: warning: incorrect type in argument 2 (different address spaces)
drm_syncobj.c:941:38:    expected void *user_handles
drm_syncobj.c:941:38:    got void [noderef] <asn:1>*<noident>

Cc: Jason Ekstrand <jason@jlekstrand.net>
Fixes: 3e6fb72d6cef ("drm/syncobj: Add a syncobj_array_find helper")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_syncobj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 26d60615b4d4..fa03a1a51453 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -799,7 +799,7 @@ static int drm_syncobj_array_wait(struct drm_device *dev,
 }
 
 static int drm_syncobj_array_find(struct drm_file *file_private,
-				  void *user_handles, uint32_t count_handles,
+				  void __user *user_handles, uint32_t count_handles,
 				  struct drm_syncobj ***syncobjs_out)
 {
 	uint32_t i, *handles;
-- 
2.13.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/4] drm: Drop drm_get_link_status_name()

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

drm_get_link_status_name() isn't used so kill it.

Fixes the following sparse warning:
drm_connector.c:618:1: warning: symbol 'drm_get_link_status_name' was not declared. Should it be static?

Cc: Manasi Navare <manasi.d.navare@intel.com>
Fixes: 40ee6fbef75f ("drm: Add a new connector atomic property for link status")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_connector.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index ba9f36cef68c..bb2e60f5feb6 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -615,7 +615,6 @@ static const struct drm_prop_enum_list drm_link_status_enum_list[] = {
 	{ DRM_MODE_LINK_STATUS_GOOD, "Good" },
 	{ DRM_MODE_LINK_STATUS_BAD, "Bad" },
 };
-DRM_ENUM_NAME_FN(drm_get_link_status_name, drm_link_status_enum_list)
 
 /**
  * drm_display_info_set_bus_formats - set the supported bus formats
-- 
2.13.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 4/4] drm: Make __drm_object_property_get_value() static

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Make __drm_object_property_get_value() static to fix the following
sparse warning:
drm_mode_object.c:250:5: warning: symbol '__drm_object_property_get_value' was not declared. Should it be static?

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: 4a97a3da420b ("drm: Don't update property values for atomic drivers")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_mode_object.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c
index 1055533792f3..7a1ea91d3343 100644
--- a/drivers/gpu/drm/drm_mode_object.c
+++ b/drivers/gpu/drm/drm_mode_object.c
@@ -247,8 +247,9 @@ int drm_object_property_set_value(struct drm_mode_object *obj,
 }
 EXPORT_SYMBOL(drm_object_property_set_value);
 
-int __drm_object_property_get_value(struct drm_mode_object *obj,
-				  struct drm_property *property, uint64_t *val)
+static int __drm_object_property_get_value(struct drm_mode_object *obj,
+					   struct drm_property *property,
+					   uint64_t *val)
 {
 	int i;
 
-- 
2.13.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/4] drm: Make syncobj import/export functions static

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 774 bytes --]

On Fri, Sep 01, 2017 at 07:53:25PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Fix the following sparse warnings by making functions static:
> drm_syncobj.c:420:5: warning: symbol 'drm_syncobj_import_sync_file_fence' was not declared. Should it be static?
> drm_syncobj.c:441:5: warning: symbol 'drm_syncobj_export_sync_file' was not declared. Should it be static?
> 
> Cc: Dave Airlie <airlied@redhat.com>
> Fixes: 3ee45a3b533a ("drm/syncobj: add sync_file interaction. (v1.2)")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_syncobj.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/4] drm: Add missing __user annotation to drm_syncobj_array_find()

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 1408 bytes --]

On Fri, Sep 01, 2017 at 07:53:26PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> 'user_handles' needs a __user annotation for fix the following sparse
> warning:
> drm_syncobj.c:813:37: warning: incorrect type in argument 2 (different address spaces)
> drm_syncobj.c:813:37:    expected void const [noderef] <asn:1>*from
> drm_syncobj.c:813:37:    got void *user_handles
> drm_syncobj.c:875:38: warning: incorrect type in argument 2 (different address spaces)
> drm_syncobj.c:875:38:    expected void *user_handles
> drm_syncobj.c:875:38:    got void [noderef] <asn:1>*<noident>
> drm_syncobj.c:908:38: warning: incorrect type in argument 2 (different address spaces)
> drm_syncobj.c:908:38:    expected void *user_handles
> drm_syncobj.c:908:38:    got void [noderef] <asn:1>*<noident>
> drm_syncobj.c:941:38: warning: incorrect type in argument 2 (different address spaces)
> drm_syncobj.c:941:38:    expected void *user_handles
> drm_syncobj.c:941:38:    got void [noderef] <asn:1>*<noident>
> 
> Cc: Jason Ekstrand <jason@jlekstrand.net>
> Fixes: 3e6fb72d6cef ("drm/syncobj: Add a syncobj_array_find helper")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_syncobj.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/4] drm: Drop drm_get_link_status_name()

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 683 bytes --]

On Fri, Sep 01, 2017 at 07:53:27PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> drm_get_link_status_name() isn't used so kill it.
> 
> Fixes the following sparse warning:
> drm_connector.c:618:1: warning: symbol 'drm_get_link_status_name' was not declared. Should it be static?
> 
> Cc: Manasi Navare <manasi.d.navare@intel.com>
> Fixes: 40ee6fbef75f ("drm: Add a new connector atomic property for link status")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_connector.c | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 4/4] drm: Make __drm_object_property_get_value() static

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 702 bytes --]

On Fri, Sep 01, 2017 at 07:53:28PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Make __drm_object_property_get_value() static to fix the following
> sparse warning:
> drm_mode_object.c:250:5: warning: symbol '__drm_object_property_get_value' was not declared. Should it be static?
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Fixes: 4a97a3da420b ("drm: Don't update property values for atomic drivers")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_mode_object.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Reviewed-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/4] drm: Drop drm_get_link_status_name()

[Manasi Navare]

On Fri, Sep 01, 2017 at 07:53:27PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> drm_get_link_status_name() isn't used so kill it.
> 
> Fixes the following sparse warning:
> drm_connector.c:618:1: warning: symbol 'drm_get_link_status_name' was not declared. Should it be static?
>

Thanks for catching this warning.
Verified that this fixes the warning and hence drm_get_link_status_name not needed.

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>

Manasi
 
> Cc: Manasi Navare <manasi.d.navare@intel.com>
> Fixes: 40ee6fbef75f ("drm: Add a new connector atomic property for link status")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_connector.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index ba9f36cef68c..bb2e60f5feb6 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -615,7 +615,6 @@ static const struct drm_prop_enum_list drm_link_status_enum_list[] = {
>  	{ DRM_MODE_LINK_STATUS_GOOD, "Good" },
>  	{ DRM_MODE_LINK_STATUS_BAD, "Bad" },
>  };
> -DRM_ENUM_NAME_FN(drm_get_link_status_name, drm_link_status_enum_list)
>  
>  /**
>   * drm_display_info_set_bus_formats - set the supported bus formats
> -- 
> 2.13.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/4] drm: Add missing __user annotation to drm_syncobj_array_find()

[Ville Syrjälä]

On Fri, Sep 01, 2017 at 07:44:46PM +0200, Thierry Reding wrote:
> On Fri, Sep 01, 2017 at 07:53:26PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > 'user_handles' needs a __user annotation for fix the following sparse
> > warning:
> > drm_syncobj.c:813:37: warning: incorrect type in argument 2 (different address spaces)
> > drm_syncobj.c:813:37:    expected void const [noderef] <asn:1>*from
> > drm_syncobj.c:813:37:    got void *user_handles
> > drm_syncobj.c:875:38: warning: incorrect type in argument 2 (different address spaces)
> > drm_syncobj.c:875:38:    expected void *user_handles
> > drm_syncobj.c:875:38:    got void [noderef] <asn:1>*<noident>
> > drm_syncobj.c:908:38: warning: incorrect type in argument 2 (different address spaces)
> > drm_syncobj.c:908:38:    expected void *user_handles
> > drm_syncobj.c:908:38:    got void [noderef] <asn:1>*<noident>
> > drm_syncobj.c:941:38: warning: incorrect type in argument 2 (different address spaces)
> > drm_syncobj.c:941:38:    expected void *user_handles
> > drm_syncobj.c:941:38:    got void [noderef] <asn:1>*<noident>
> > 
> > Cc: Jason Ekstrand <jason@jlekstrand.net>
> > Fixes: 3e6fb72d6cef ("drm/syncobj: Add a syncobj_array_find helper")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/drm_syncobj.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Thierry Reding <treding@nvidia.com>

Pushed the remainder of this series to drm-misc-next. Thanks for the review.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel