On Mon, Jan 9, 2017 at 6:25 AM, Shawn Guo <shawnguo@xxxxxxxxxx> wrote:
> From: Shawn Guo <shawn.guo@xxxxxxxxxx>
>
> Use drm_crtc_from_index() to find drm_crtc for given index.
>
> Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
> Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
Applied to drm-misc-next
Thanks!
Sean
> ---
> drivers/gpu/drm/nouveau/nouveau_display.c | 33 +++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
> index cef08da1da4e..a0e7221d6568 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_display.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
> @@ -58,27 +58,30 @@
> nouveau_display_vblank_enable(struct drm_device *dev, unsigned int pipe)
> {
> struct drm_crtc *crtc;
> - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
> - struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
> - if (nv_crtc->index == pipe) {
> - nvif_notify_get(&nv_crtc->vblank);
> - return 0;
> - }
> - }
> - return -EINVAL;
> + struct nouveau_crtc *nv_crtc;
> +
> + crtc = drm_crtc_from_index(dev, pipe);
> + if (!crtc)
> + return -EINVAL;
> +
> + nv_crtc = nouveau_crtc(crtc);
> + nvif_notify_get(&nv_crtc->vblank);
> +
> + return 0;
> }
>
> void
> nouveau_display_vblank_disable(struct drm_device *dev, unsigned int pipe)
> {
> struct drm_crtc *crtc;
> - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
> - struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
> - if (nv_crtc->index == pipe) {
> - nvif_notify_put(&nv_crtc->vblank);
> - return;
> - }
> - }
> + struct nouveau_crtc *nv_crtc;
> +
> + crtc = drm_crtc_from_index(dev, pipe);
> + if (!crtc)
> + return;
> +
> + nv_crtc = nouveau_crtc(crtc);
> + nvif_notify_put(&nv_crtc->vblank);
> }
>
> static inline int
> --
> 1.9.1
>
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
