| Message ID | 1393330197.4156.5.camel@pizza.hi.pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 25, 2014 at 01:09:57PM +0100, Philipp Zabel wrote: > Am Dienstag, den 25.02.2014, 12:43 +0100 schrieb Philipp Zabel: > > The i.MX Image Processing Unit (IPU) contains a number of image processing > > blocks that sit right in the middle between DRM and V4L2. Some of the modules, > > such as Display Controller, Processor, and Interface (DC, DP, DI) or CMOS > > Sensor Interface (CSI) and their FIFOs could be assigned to either framework, > > but others, such as the dma controller (IDMAC) and image converter (IC) can > > be used by both. > > The IPUv3 core driver provides an internal API to access the modules, to be > > used by both DRM and V4L2 IPUv3 drivers. > [...] > > This one is missing: > > diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c > index cb4eb76..9aeb863 100644 > --- a/drivers/staging/imx-drm/imx-hdmi.c > +++ b/drivers/staging/imx-drm/imx-hdmi.c > @@ -28,7 +28,8 @@ > #include <drm/drm_edid.h> > #include <drm/drm_encoder_slave.h> > > -#include "ipu-v3/imx-ipu-v3.h" > +#include <video/imx-ipu-v3.h> > + What do you mean? I can't apply this patch? Totally confused, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Feb 27, 2014 at 12:41:36PM -0800, Greg Kroah-Hartman wrote: > On Tue, Feb 25, 2014 at 01:09:57PM +0100, Philipp Zabel wrote: > > Am Dienstag, den 25.02.2014, 12:43 +0100 schrieb Philipp Zabel: > > > The i.MX Image Processing Unit (IPU) contains a number of image processing > > > blocks that sit right in the middle between DRM and V4L2. Some of the modules, > > > such as Display Controller, Processor, and Interface (DC, DP, DI) or CMOS > > > Sensor Interface (CSI) and their FIFOs could be assigned to either framework, > > > but others, such as the dma controller (IDMAC) and image converter (IC) can > > > be used by both. > > > The IPUv3 core driver provides an internal API to access the modules, to be > > > used by both DRM and V4L2 IPUv3 drivers. > > [...] > > > > This one is missing: > > > > diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c > > index cb4eb76..9aeb863 100644 > > --- a/drivers/staging/imx-drm/imx-hdmi.c > > +++ b/drivers/staging/imx-drm/imx-hdmi.c > > @@ -28,7 +28,8 @@ > > #include <drm/drm_edid.h> > > #include <drm/drm_encoder_slave.h> > > > > -#include "ipu-v3/imx-ipu-v3.h" > > +#include <video/imx-ipu-v3.h> > > + > > What do you mean? I can't apply this patch? I understand it as: Please squash this hunk changing the #include into patch 3. But note that I don't know anything about the stuff Philipp is working on. Thanks Uwe
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c index cb4eb76..9aeb863 100644 --- a/drivers/staging/imx-drm/imx-hdmi.c +++ b/drivers/staging/imx-drm/imx-hdmi.c @@ -28,7 +28,8 @@ #include <drm/drm_edid.h> #include <drm/drm_encoder_slave.h> -#include "ipu-v3/imx-ipu-v3.h" +#include <video/imx-ipu-v3.h> + #include "imx-hdmi.h" #include "imx-drm.h"