Commit 51955324 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

drm: renesas: shmobile: Rename shmob_drm_crtc.crtc

Rename the "crtc" member of the shmob_drm_crtc subclass structure to
"base", to improve readability.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarSui Jingfeng <suijingfeng@loongson.cn>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/b42a32082d25bde6db7a57d8dc0d9f45820f6716.1694767209.git.geert+renesas@glider.be
parent c2288234
...@@ -55,7 +55,7 @@ static const struct { ...@@ -55,7 +55,7 @@ static const struct {
static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
{ {
struct drm_crtc *crtc = &scrtc->crtc; struct drm_crtc *crtc = &scrtc->base;
struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
const struct drm_display_info *info = &sdev->connector->display_info; const struct drm_display_info *info = &sdev->connector->display_info;
const struct drm_display_mode *mode = &crtc->mode; const struct drm_display_mode *mode = &crtc->mode;
...@@ -114,7 +114,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) ...@@ -114,7 +114,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start) static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
{ {
struct shmob_drm_device *sdev = to_shmob_device(scrtc->crtc.dev); struct shmob_drm_device *sdev = to_shmob_device(scrtc->base.dev);
u32 value; u32 value;
value = lcdc_read(sdev, LDCNT2R); value = lcdc_read(sdev, LDCNT2R);
...@@ -147,7 +147,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start) ...@@ -147,7 +147,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
*/ */
static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
{ {
struct drm_crtc *crtc = &scrtc->crtc; struct drm_crtc *crtc = &scrtc->base;
struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
const struct shmob_drm_format_info *format; const struct shmob_drm_format_info *format;
...@@ -227,7 +227,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) ...@@ -227,7 +227,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
{ {
struct drm_crtc *crtc = &scrtc->crtc; struct drm_crtc *crtc = &scrtc->base;
struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
if (!scrtc->started) if (!scrtc->started)
...@@ -260,7 +260,7 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc) ...@@ -260,7 +260,7 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc)
static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
int x, int y) int x, int y)
{ {
struct drm_crtc *crtc = &scrtc->crtc; struct drm_crtc *crtc = &scrtc->base;
struct drm_framebuffer *fb = crtc->primary->fb; struct drm_framebuffer *fb = crtc->primary->fb;
struct drm_gem_dma_object *gem; struct drm_gem_dma_object *gem;
unsigned int bpp; unsigned int bpp;
...@@ -281,7 +281,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, ...@@ -281,7 +281,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc) static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
{ {
struct drm_crtc *crtc = &scrtc->crtc; struct drm_crtc *crtc = &scrtc->base;
struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y); shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y);
...@@ -295,7 +295,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc) ...@@ -295,7 +295,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc) static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc)
{ {
return container_of(crtc, struct shmob_drm_crtc, crtc); return container_of(crtc, struct shmob_drm_crtc, base);
} }
static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode) static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
...@@ -367,15 +367,15 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = { ...@@ -367,15 +367,15 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc)
{ {
struct drm_pending_vblank_event *event; struct drm_pending_vblank_event *event;
struct drm_device *dev = scrtc->crtc.dev; struct drm_device *dev = scrtc->base.dev;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dev->event_lock, flags); spin_lock_irqsave(&dev->event_lock, flags);
event = scrtc->event; event = scrtc->event;
scrtc->event = NULL; scrtc->event = NULL;
if (event) { if (event) {
drm_crtc_send_vblank_event(&scrtc->crtc, event); drm_crtc_send_vblank_event(&scrtc->base, event);
drm_crtc_vblank_put(&scrtc->crtc); drm_crtc_vblank_put(&scrtc->base);
} }
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irqrestore(&dev->event_lock, flags);
} }
...@@ -387,7 +387,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, ...@@ -387,7 +387,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
struct drm_modeset_acquire_ctx *ctx) struct drm_modeset_acquire_ctx *ctx)
{ {
struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc); struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
struct drm_device *dev = scrtc->crtc.dev; struct drm_device *dev = scrtc->base.dev;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dev->event_lock, flags); spin_lock_irqsave(&dev->event_lock, flags);
...@@ -402,7 +402,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, ...@@ -402,7 +402,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
if (event) { if (event) {
event->pipe = 0; event->pipe = 0;
drm_crtc_vblank_get(&scrtc->crtc); drm_crtc_vblank_get(&scrtc->base);
spin_lock_irqsave(&dev->event_lock, flags); spin_lock_irqsave(&dev->event_lock, flags);
scrtc->event = event; scrtc->event = event;
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irqrestore(&dev->event_lock, flags);
...@@ -454,7 +454,7 @@ static const struct drm_crtc_funcs crtc_funcs = { ...@@ -454,7 +454,7 @@ static const struct drm_crtc_funcs crtc_funcs = {
int shmob_drm_crtc_create(struct shmob_drm_device *sdev) int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
{ {
struct drm_crtc *crtc = &sdev->crtc.crtc; struct drm_crtc *crtc = &sdev->crtc.base;
struct drm_plane *primary, *plane; struct drm_plane *primary, *plane;
unsigned int i; unsigned int i;
int ret; int ret;
......
...@@ -21,7 +21,7 @@ struct shmob_drm_device; ...@@ -21,7 +21,7 @@ struct shmob_drm_device;
struct shmob_drm_format_info; struct shmob_drm_format_info;
struct shmob_drm_crtc { struct shmob_drm_crtc {
struct drm_crtc crtc; struct drm_crtc base;
struct drm_pending_vblank_event *event; struct drm_pending_vblank_event *event;
int dpms; int dpms;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment