Message ID | 2382c4c796b53b5d2b24f99b85954ce632f21b90.1694767209.git.geert+renesas@glider.be (mailing list archive) |
---|---|
State | Mainlined |
Commit | 9d7bd3b12e6a88cf163c0b414c285a995c634d7c |
Delegated to: | Kieran Bingham |
Headers | show |
Series | drm: renesas: shmobile: Atomic conversion + DT support | expand |
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 84a773a5363035e0..f55b5263e611c782 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -560,7 +560,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connector *connector) { - return container_of(connector, struct shmob_drm_connector, connector); + return container_of(connector, struct shmob_drm_connector, base); } static int shmob_drm_connector_get_modes(struct drm_connector *connector) @@ -632,7 +632,7 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev, if (!scon) return ERR_PTR(-ENOMEM); - connector = &scon->connector; + connector = &scon->base; scon->encoder = encoder; scon->mode = &sdev->pdata->panel.mode; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h index 79cce0a0ada4cfce..2c6d7541427581a6 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -33,7 +33,7 @@ struct shmob_drm_crtc { }; struct shmob_drm_connector { - struct drm_connector connector; + struct drm_connector base; struct drm_encoder *encoder; const struct videomode *mode; };