Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b3ccfe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: Fix naming for msm event notification"

parents 6fb798da 34a92c7b

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ static int msm_ioctl_deregister_event(struct drm_device *dev, void *data, 
	return ret;

}



void msm_mode_object_event_nofity(struct drm_mode_object *obj,

void msm_mode_object_event_notify(struct drm_mode_object *obj,

		struct drm_device *dev, struct drm_event *event, u8 *payload)

{

	struct msm_drm_private *priv = NULL;

drivers/gpu/drm/msm/msm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ enum msm_dsi_encoder_id { 
 * @event: event that needs to be notified.

 * @payload: payload for the event.

 */

void msm_mode_object_event_nofity(struct drm_mode_object *obj,

void msm_mode_object_event_notify(struct drm_mode_object *obj,

		struct drm_device *dev, struct drm_event *event, u8 *payload);

#ifdef CONFIG_DRM_MSM_DSI

void __init msm_dsi_register(void);

drivers/gpu/drm/msm/sde/sde_color_processing.c

+1 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,7 @@ static void sde_cp_notify_ad_event(struct drm_crtc *crtc_drm, void *arg) 
	hw_dspp->ops.ad_read_intr_resp(hw_dspp, AD4_BACKLIGHT, &bl);

	event.length = sizeof(u32);

	event.type = DRM_EVENT_AD_BACKLIGHT;

	msm_mode_object_event_nofity(&crtc_drm->base, crtc_drm->dev,

	msm_mode_object_event_notify(&crtc_drm->base, crtc_drm->dev,

			&event, (u8 *)&bl);

}

drivers/gpu/drm/msm/sde/sde_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int sde_backlight_device_update_status(struct backlight_device *bd) 
	if (c_conn->ops.set_backlight) {

		event.type = DRM_EVENT_SYS_BACKLIGHT;

		event.length = sizeof(u32);

		msm_mode_object_event_nofity(&c_conn->base.base,

		msm_mode_object_event_notify(&c_conn->base.base,

				c_conn->base.dev, &event, (u8 *)&brightness);

		c_conn->ops.set_backlight(c_conn->display, bl_lvl);

	}

drivers/gpu/drm/msm/sde/sde_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -2319,7 +2319,7 @@ static void _sde_crtc_set_suspend(struct drm_crtc *crtc, bool enable) 
		_sde_crtc_vblank_enable_nolock(sde_crtc, !enable);



	sde_crtc->suspend = enable;

	msm_mode_object_event_nofity(&crtc->base, crtc->dev, &event,

	msm_mode_object_event_notify(&crtc->base, crtc->dev, &event,

			(u8 *)&power_on);

	mutex_unlock(&sde_crtc->crtc_lock);

}