From: Thomas Wood <thomas.wood@intel.com>
To: Micah Fedke <micah.fedke@collabora.co.uk>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 3/3] overlay: remove crtc<->pipe mapping code from kms-overlay
Date: Tue, 8 Sep 2015 12:07:37 +0100 [thread overview]
Message-ID: <CANkqdn3JiqS+vmjUXHjn+Z4-ap+oOvtKM8EO10WhtJJLtSbsDg@mail.gmail.com> (raw)
In-Reply-To: <1441390979-1747-4-git-send-email-micah.fedke@collabora.co.uk>
On 4 September 2015 at 19:22, Micah Fedke <micah.fedke@collabora.co.uk> wrote:
> the crtc id is now always equivalent to its index in the array of crtcs
> returned by the kernel
>
> ---
> overlay/Makefile.am | 4 ++--
> overlay/kms/kms-overlay.c | 7 ++-----
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/overlay/Makefile.am b/overlay/Makefile.am
> index c648875..c82026c 100644
> --- a/overlay/Makefile.am
> +++ b/overlay/Makefile.am
> @@ -3,8 +3,8 @@ bin_PROGRAMS = intel-gpu-overlay
> endif
>
> AM_CPPFLAGS = -I.
> -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS)
> -LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS)
> +AM_CFLAGS = $(LIBUNWIND_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS)
> +LDADD = ../lib/libintel_tools.la $(LIBUNWIND_LIBS) $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS)
It might be better to use $(top_builddir)/lib/libintel_tools.la here.
>
> intel_gpu_overlay_SOURCES = \
> i915_pciids.h \
> diff --git a/overlay/kms/kms-overlay.c b/overlay/kms/kms-overlay.c
> index cfb3d5a..1d85729 100644
> --- a/overlay/kms/kms-overlay.c
> +++ b/overlay/kms/kms-overlay.c
> @@ -38,6 +38,7 @@
> #include <xf86drmMode.h>
> #include <i915_drm.h>
> #include "../overlay.h"
> +#include "../../lib/igt_kms.h"
Please add -I$(top_srcdir)/lib to CFLAGS and include "igt.h".
> //#include "rgb2yuv.h"
>
> #ifndef ALIGN
> @@ -244,11 +245,7 @@ kms_overlay_create(struct config *config, int *width, int *height)
>
> get_pipe.pipe = 0;
> get_pipe.crtc_id = kmode->crtcs[i];
> - if (drmIoctl(priv->fd,
> - DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
> - &get_pipe)) {
> - continue;
> - }
> + get_pipe.pipe = kmstest_get_pipe_from_crtc_id(priv->fd, get_pipe.crtc_id);
>
> if (get_pipe.pipe != pipe)
> continue;
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-09-08 11:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 18:22 [PATCH 0/3] remove crtc<->pipe mapping code Micah Fedke
2015-09-04 18:22 ` [PATCH 1/3] lib: update kmstest_get_pipe_from_crtc_id Micah Fedke
2015-09-04 18:22 ` [PATCH 2/3] tests/drm_read: remove manual crtc<->pipe mapping from drm_read test Micah Fedke
2015-09-04 18:22 ` [PATCH 3/3] overlay: remove crtc<->pipe mapping code from kms-overlay Micah Fedke
2015-09-08 11:07 ` Thomas Wood [this message]
2015-09-08 11:07 ` [PATCH 0/3] remove crtc<->pipe mapping code Thomas Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANkqdn3JiqS+vmjUXHjn+Z4-ap+oOvtKM8EO10WhtJJLtSbsDg@mail.gmail.com \
--to=thomas.wood@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=micah.fedke@collabora.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.