| Message ID | 1432760183-4342-5-git-send-email-gustavo@padovan.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/28/2015 05:56 AM, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > The new atomic infrastructure needs the .mode_set_nofb() callback to > update CRTC timings before setting any plane. > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com> > Tested-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > --- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 64 +++++--------------------------- > 1 file changed, 9 insertions(+), 55 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > index ba44c9b..c524f0c 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > @@ -62,9 +62,6 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc) > > if (exynos_crtc->ops->win_commit) > exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos); > - > - if (exynos_crtc->ops->commit) > - exynos_crtc->ops->commit(exynos_crtc); > } > > static bool > @@ -81,60 +78,16 @@ exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc, > return true; > } > > -static int > -exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode, int x, int y, > - struct drm_framebuffer *old_fb) > -{ > - struct drm_framebuffer *fb = crtc->primary->fb; > - unsigned int crtc_w; > - unsigned int crtc_h; > - int ret; > - > - /* > - * copy the mode data adjusted by mode_fixup() into crtc->mode > - * so that hardware can be seet to proper mode. > - */ > - memcpy(&crtc->mode, adjusted_mode, sizeof(*adjusted_mode)); Let's apply using crtc->state->adjusted_mode instead of crtc->mode on exynos drm. > - > - ret = exynos_check_plane(crtc->primary, fb); > - if (ret < 0) > - return ret; > - > - crtc_w = fb->width - x; > - crtc_h = fb->height - y; > - exynos_plane_mode_set(crtc->primary, crtc, fb, 0, 0, > - crtc_w, crtc_h, x, y, crtc_w, crtc_h); > - > - return 0; > -} > - > -static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, > - struct drm_framebuffer *old_fb) > +static void > +exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); > - struct drm_framebuffer *fb = crtc->primary->fb; > - unsigned int crtc_w; > - unsigned int crtc_h; > - int ret; > - > - /* when framebuffer changing is requested, crtc's dpms should be on */ > - if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) { > - DRM_ERROR("failed framebuffer changing request.\n"); > - return -EPERM; > - } > > - ret = exynos_check_plane(crtc->primary, fb); > - if (ret) > - return ret; > - > - crtc_w = fb->width - x; > - crtc_h = fb->height - y; > - exynos_update_plane(crtc->primary, crtc, fb, 0, 0, > - crtc_w, crtc_h, x << 16, y << 16, > - crtc_w << 16, crtc_h << 16); > + if (WARN_ON(!crtc->state)) > + return; crtc->state cannot be NULL if we use drm_helper_crtc_mode_set. > > - return 0; > + if (exynos_crtc->ops->commit) > + exynos_crtc->ops->commit(exynos_crtc); > } > > static void exynos_drm_crtc_disable(struct drm_crtc *crtc) > @@ -159,8 +112,9 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { > .prepare = exynos_drm_crtc_prepare, > .commit = exynos_drm_crtc_commit, > .mode_fixup = exynos_drm_crtc_mode_fixup, > - .mode_set = exynos_drm_crtc_mode_set, > - .mode_set_base = exynos_drm_crtc_mode_set_base, > + .mode_set = drm_helper_crtc_mode_set, > + .mode_set_nofb = exynos_drm_crtc_mode_set_nofb, > + .mode_set_base = drm_helper_crtc_mode_set_base, > .disable = exynos_drm_crtc_disable, > }; > >
On 05/28/2015 05:24 PM, Joonyoung Shim wrote: > On 05/28/2015 05:56 AM, Gustavo Padovan wrote: >> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> >> >> The new atomic infrastructure needs the .mode_set_nofb() callback to >> update CRTC timings before setting any plane. >> >> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> >> Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com> >> Tested-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> >> --- >> drivers/gpu/drm/exynos/exynos_drm_crtc.c | 64 +++++--------------------------- >> 1 file changed, 9 insertions(+), 55 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c >> index ba44c9b..c524f0c 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c >> @@ -62,9 +62,6 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc) >> >> if (exynos_crtc->ops->win_commit) >> exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos); >> - >> - if (exynos_crtc->ops->commit) >> - exynos_crtc->ops->commit(exynos_crtc); >> } >> >> static bool >> @@ -81,60 +78,16 @@ exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc, >> return true; >> } >> >> -static int >> -exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, >> - struct drm_display_mode *adjusted_mode, int x, int y, >> - struct drm_framebuffer *old_fb) >> -{ >> - struct drm_framebuffer *fb = crtc->primary->fb; >> - unsigned int crtc_w; >> - unsigned int crtc_h; >> - int ret; >> - >> - /* >> - * copy the mode data adjusted by mode_fixup() into crtc->mode >> - * so that hardware can be seet to proper mode. >> - */ >> - memcpy(&crtc->mode, adjusted_mode, sizeof(*adjusted_mode)); > > Let's apply using crtc->state->adjusted_mode instead of crtc->mode on > exynos drm. > I will make a patch for this, could you rebase from 05/18 of your patchset on the patch if no any problem?
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index ba44c9b..c524f0c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -62,9 +62,6 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc) if (exynos_crtc->ops->win_commit) exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos); - - if (exynos_crtc->ops->commit) - exynos_crtc->ops->commit(exynos_crtc); } static bool @@ -81,60 +78,16 @@ exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc, return true; } -static int -exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode, int x, int y, - struct drm_framebuffer *old_fb) -{ - struct drm_framebuffer *fb = crtc->primary->fb; - unsigned int crtc_w; - unsigned int crtc_h; - int ret; - - /* - * copy the mode data adjusted by mode_fixup() into crtc->mode - * so that hardware can be seet to proper mode. - */ - memcpy(&crtc->mode, adjusted_mode, sizeof(*adjusted_mode)); - - ret = exynos_check_plane(crtc->primary, fb); - if (ret < 0) - return ret; - - crtc_w = fb->width - x; - crtc_h = fb->height - y; - exynos_plane_mode_set(crtc->primary, crtc, fb, 0, 0, - crtc_w, crtc_h, x, y, crtc_w, crtc_h); - - return 0; -} - -static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, - struct drm_framebuffer *old_fb) +static void +exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); - struct drm_framebuffer *fb = crtc->primary->fb; - unsigned int crtc_w; - unsigned int crtc_h; - int ret; - - /* when framebuffer changing is requested, crtc's dpms should be on */ - if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) { - DRM_ERROR("failed framebuffer changing request.\n"); - return -EPERM; - } - ret = exynos_check_plane(crtc->primary, fb); - if (ret) - return ret; - - crtc_w = fb->width - x; - crtc_h = fb->height - y; - exynos_update_plane(crtc->primary, crtc, fb, 0, 0, - crtc_w, crtc_h, x << 16, y << 16, - crtc_w << 16, crtc_h << 16); + if (WARN_ON(!crtc->state)) + return; - return 0; + if (exynos_crtc->ops->commit) + exynos_crtc->ops->commit(exynos_crtc); } static void exynos_drm_crtc_disable(struct drm_crtc *crtc) @@ -159,8 +112,9 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { .prepare = exynos_drm_crtc_prepare, .commit = exynos_drm_crtc_commit, .mode_fixup = exynos_drm_crtc_mode_fixup, - .mode_set = exynos_drm_crtc_mode_set, - .mode_set_base = exynos_drm_crtc_mode_set_base, + .mode_set = drm_helper_crtc_mode_set, + .mode_set_nofb = exynos_drm_crtc_mode_set_nofb, + .mode_set_base = drm_helper_crtc_mode_set_base, .disable = exynos_drm_crtc_disable, };