[PATCH] drm: Fix drm_atomic_get_new_crtc_state call error

[Zhaoge Zhang]

This position is to clear the previous mask flags,
so drm_atomic_get_crtc_state should be used.

Signed-off-by: Zhaoge Zhang 
---
 drivers/gpu/drm/drm_atomic_uapi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c 
b/drivers/gpu/drm/drm_atomic_uapi.c
index 268bb69..07fe01b 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -313,8 +313,8 @@ drm_atomic_set_crtc_for_connector(struct 
drm_connector_state *conn_state,
return 0;
 
if (conn_state->crtc) {
-   crtc_state = drm_atomic_get_new_crtc_state(conn_state->state,
-  conn_state->crtc);
+   crtc_state = drm_atomic_get_crtc_state(conn_state->state,
+   conn_state->crtc);
 
crtc_state->connector_mask &=
~drm_connector_mask(conn_state->connector);
-- 
2.7.4

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

[PATCH] drm: Removes invalid function return value comment information

[Zhaoge Zhang]

Signed-off-by: Zhaoge Zhang 
---
 drivers/gpu/drm/drm_file.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index b50380f..8548e8b 100644
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -240,9 +240,6 @@ static void drm_events_release(struct drm_file *file_priv)
  * before calling this.
  *
  * If NULL is passed, this is a no-op.
- *
- * RETURNS:
- * 0 on success, or error code on failure.
  */
 void drm_file_free(struct drm_file *file)
 {
-- 
2.7.4

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

[PATCH] drm: Fix macro name DRM_MODE_PROP_OBJECT in code comment

[Zhaoge Zhang]

Signed-off-by: Zhaoge Zhang 
---
 include/drm/drm_property.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h
index 4a0a80d..bbf5c1fd 100644
--- a/include/drm/drm_property.h
+++ b/include/drm/drm_property.h
@@ -114,7 +114,7 @@ struct drm_property {
 * by the property. Bitmask properties are created using
 * drm_property_create_bitmask().
 *
-* DRM_MODE_PROB_OBJECT
+* DRM_MODE_PROP_OBJECT
 * Object properties are used to link modeset objects. This is used
 * extensively in the atomic support to create the display pipeline,
 * by linking _framebuffer to _plane, _plane to
-- 
2.7.4

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