diff for duplicates of <1463323.zSQmk3Du5c@avalon> diff --git a/a/1.txt b/N1/1.txt index 7e602b9..484b88e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Thank you. > > + __rcar_du_start_stop(rcdu, false); > > + __rcar_du_start_stop(rcdu, true); > > + } else { -> > + if (--rcdu->used_crtcs = 0) +> > + if (--rcdu->used_crtcs == 0) > > + __rcar_du_start_stop(rcdu, false); > > + } > > +} @@ -76,7 +76,7 @@ need to finish CDF first. > > + int ret; > > + > > + format = rcar_du_format_info(crtc->fb->pixel_format); -> > + if (format = NULL) { +> > + if (format == NULL) { > > + dev_dbg(rcdu->dev, "mode_set: unsupported format %08x\n", > > + crtc->fb->pixel_format); > > + ret = -EINVAL; @@ -138,10 +138,11 @@ errors before calling the prepare operation. > > + rcrtc->event = NULL; > > + spin_unlock_irqrestore(&dev->event_lock, flags); > > + -> > + if (event = NULL) +> > + if (event == NULL) > > + return; > > + -> > + event->event.sequence > > + drm_vblank_count_and_time(dev, rcrtc->index, &vblanktime); +> > + event->event.sequence = +> > + drm_vblank_count_and_time(dev, rcrtc->index, &vblanktime); > > + event->event.tv_sec = vblanktime.tv_sec; > > + event->event.tv_usec = vblanktime.tv_usec; > > + @@ -218,7 +219,8 @@ How would you like to fix it ? :-) > > + rcdu->num_crtcs = i; > > + > > + for (i = 0; i < rcdu->pdata->num_encoders; ++i) { -> > + const struct rcar_du_encoder_data *pdata > > + &rcdu->pdata->encoders[i]; +> > + const struct rcar_du_encoder_data *pdata = +> > + &rcdu->pdata->encoders[i]; > > + > > + if (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) { > > + dev_warn(rcdu->dev, @@ -311,11 +313,11 @@ Not yet. It's scheduled for a future update, for v3.12. > > + struct rcar_du_device *rcdu = plane->dev->dev_private; > > + struct rcar_du_plane *rplane = to_rcar_plane(plane); > > + -> > + if (property = rcdu->planes.alpha) +> > + if (property == rcdu->planes.alpha) > > + rcar_du_plane_set_alpha(rplane, value); -> > + else if (property = rcdu->planes.colorkey) +> > + else if (property == rcdu->planes.colorkey) > > + rcar_du_plane_set_colorkey(rplane, value); -> > + else if (property = rcdu->planes.zpos) +> > + else if (property == rcdu->planes.zpos) > > + rcar_du_plane_set_zpos(rplane, value); > > + else > > + return -EINVAL; diff --git a/a/content_digest b/N1/content_digest index ab95a37..af90d34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020130604141236.GC15743@phenom.ffwll.local\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v3] drm: Renesas R-Car Display Unit DRM driver\0" - "Date\0Tue, 04 Jun 2013 18:03:19 +0000\0" + "Date\0Tue, 04 Jun 2013 20:03:19 +0200\0" "To\0Daniel Vetter <daniel@ffwll.ch>\0" "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" dri-devel@lists.freedesktop.org @@ -61,7 +61,7 @@ "> > +\t\t\t__rcar_du_start_stop(rcdu, false);\n" "> > +\t\t__rcar_du_start_stop(rcdu, true);\n" "> > +\t} else {\n" - "> > +\t\tif (--rcdu->used_crtcs = 0)\n" + "> > +\t\tif (--rcdu->used_crtcs == 0)\n" "> > +\t\t\t__rcar_du_start_stop(rcdu, false);\n" "> > +\t}\n" "> > +}\n" @@ -87,7 +87,7 @@ "> > +\tint ret;\n" "> > +\n" "> > +\tformat = rcar_du_format_info(crtc->fb->pixel_format);\n" - "> > +\tif (format = NULL) {\n" + "> > +\tif (format == NULL) {\n" "> > +\t\tdev_dbg(rcdu->dev, \"mode_set: unsupported format %08x\\n\",\n" "> > +\t\t\tcrtc->fb->pixel_format);\n" "> > +\t\tret = -EINVAL;\n" @@ -149,10 +149,11 @@ "> > +\trcrtc->event = NULL;\n" "> > +\tspin_unlock_irqrestore(&dev->event_lock, flags);\n" "> > +\n" - "> > +\tif (event = NULL)\n" + "> > +\tif (event == NULL)\n" "> > +\t\treturn;\n" "> > +\n" - "> > +\tevent->event.sequence > > +\t\tdrm_vblank_count_and_time(dev, rcrtc->index, &vblanktime);\n" + "> > +\tevent->event.sequence =\n" + "> > +\t\tdrm_vblank_count_and_time(dev, rcrtc->index, &vblanktime);\n" "> > +\tevent->event.tv_sec = vblanktime.tv_sec;\n" "> > +\tevent->event.tv_usec = vblanktime.tv_usec;\n" "> > +\n" @@ -229,7 +230,8 @@ "> > +\trcdu->num_crtcs = i;\n" "> > +\n" "> > +\tfor (i = 0; i < rcdu->pdata->num_encoders; ++i) {\n" - "> > +\t\tconst struct rcar_du_encoder_data *pdata > > +\t\t\t&rcdu->pdata->encoders[i];\n" + "> > +\t\tconst struct rcar_du_encoder_data *pdata =\n" + "> > +\t\t\t&rcdu->pdata->encoders[i];\n" "> > +\n" "> > +\t\tif (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) {\n" "> > +\t\t\tdev_warn(rcdu->dev,\n" @@ -322,11 +324,11 @@ "> > +\tstruct rcar_du_device *rcdu = plane->dev->dev_private;\n" "> > +\tstruct rcar_du_plane *rplane = to_rcar_plane(plane);\n" "> > +\n" - "> > +\tif (property = rcdu->planes.alpha)\n" + "> > +\tif (property == rcdu->planes.alpha)\n" "> > +\t\trcar_du_plane_set_alpha(rplane, value);\n" - "> > +\telse if (property = rcdu->planes.colorkey)\n" + "> > +\telse if (property == rcdu->planes.colorkey)\n" "> > +\t\trcar_du_plane_set_colorkey(rplane, value);\n" - "> > +\telse if (property = rcdu->planes.zpos)\n" + "> > +\telse if (property == rcdu->planes.zpos)\n" "> > +\t\trcar_du_plane_set_zpos(rplane, value);\n" "> > +\telse\n" "> > +\t\treturn -EINVAL;\n" @@ -386,4 +388,4 @@ "\n" Laurent Pinchart -0658b2b8325a632010f215b9bfaf3ab98624a335651e8e76dcb13973cd90e4b0 +dc7d0e1e670ef15e8bfd8240905254889a56c2a3882b7cd0b077128822cd85ce
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.