| Message ID | 1584447077-22539-1-git-send-email-rohit.visavalia@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [libdrm] modetest: set_gamma only if CRTC supports gamma property | expand |
Not an enormous fan of what you had to do in atomic_set_planes, but OTOH I don't see a much better way to do it either. Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> On Tue, Mar 17, 2020 at 8:11 AM Rohit Visavalia <rohit.visavalia@xilinx.com> wrote: > > Current implementation shows error as "failed to set gamma: Function > no implemented" if platform specific drm has no gamma property implemented > > Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com> > --- > tests/modetest/modetest.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c > index b907ab3..23ee73d 100644 > --- a/tests/modetest/modetest.c > +++ b/tests/modetest/modetest.c > @@ -1328,14 +1328,24 @@ static int set_plane(struct device *dev, struct plane_arg *p) > static void atomic_set_planes(struct device *dev, struct plane_arg *p, > unsigned int count, bool update) > { > - unsigned int i, pattern = primary_fill; > + unsigned int i, j, pattern = primary_fill; > + struct crtc *crtc = NULL; > > /* set up planes */ > for (i = 0; i < count; i++) { > - if (i > 0) > + if (i > 0) { > pattern = secondary_fill; > - else > - set_gamma(dev, p[i].crtc_id, p[i].fourcc); > + } else { > + for (j = 0; j < dev->resources->res->count_crtcs; j++) { > + if (p[i].crtc_id == > + dev->resources->res->crtcs[j]) { > + crtc = &dev->resources->crtcs[j]; > + break; > + } > + } > + if (crtc->crtc->gamma_size) > + set_gamma(dev, p[i].crtc_id, p[i].fourcc); > + } > > if (atomic_set_plane(dev, &p[i], pattern, update)) > return; > @@ -1522,7 +1532,8 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co > return; > } > > - set_gamma(dev, pipe->crtc->crtc->crtc_id, pipe->fourcc); > + if (pipe->crtc->crtc->gamma_size) > + set_gamma(dev, pipe->crtc->crtc->crtc_id, pipe->fourcc); > } > } > > -- > 2.7.4 > > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
Hi Ville, This patch is already reviewed by Ilia Mirkin <imirkin@alum.mit.edu> and I have unit tested it, if it looks good to you could you please merge it? Thanks Rohit > -----Original Message----- > From: Ilia Mirkin [mailto:imirkin@alum.mit.edu] > Sent: Monday, March 23, 2020 11:10 AM > To: Rohit Visavalia <RVISAVAL@xilinx.com> > Cc: dri-devel <dri-devel@lists.freedesktop.org>; Emil Velikov > <emil.velikov@collabora.com>; Hyun Kwon <hyunk@xilinx.com>; Devarsh > Thakkar <DEVARSHT@xilinx.com>; Dhaval Rajeshbhai Shah > <dshah@xilinx.com>; Ranganathan Sk <rsk@xilinx.com>; Varunkumar > Allagadapa <VARUNKUM@xilinx.com> > Subject: Re: [PATCH libdrm] modetest: set_gamma only if CRTC supports > gamma property > > CAUTION: This message has originated from an External Source. Please use > proper judgment and caution when opening attachments, clicking links, or > responding to this email. > > > Not an enormous fan of what you had to do in atomic_set_planes, but OTOH I > don't see a much better way to do it either. > > Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> > > On Tue, Mar 17, 2020 at 8:11 AM Rohit Visavalia <rohit.visavalia@xilinx.com> > wrote: > > > > Current implementation shows error as "failed to set gamma: Function > > no implemented" if platform specific drm has no gamma property > > implemented > > > > Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com> > > --- > > tests/modetest/modetest.c | 21 ++++++++++++++++----- > > 1 file changed, 16 insertions(+), 5 deletions(-) > > > > diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c > > index b907ab3..23ee73d 100644 > > --- a/tests/modetest/modetest.c > > +++ b/tests/modetest/modetest.c > > @@ -1328,14 +1328,24 @@ static int set_plane(struct device *dev, > > struct plane_arg *p) static void atomic_set_planes(struct device *dev, struct > plane_arg *p, > > unsigned int count, bool update) { > > - unsigned int i, pattern = primary_fill; > > + unsigned int i, j, pattern = primary_fill; > > + struct crtc *crtc = NULL; > > > > /* set up planes */ > > for (i = 0; i < count; i++) { > > - if (i > 0) > > + if (i > 0) { > > pattern = secondary_fill; > > - else > > - set_gamma(dev, p[i].crtc_id, p[i].fourcc); > > + } else { > > + for (j = 0; j < dev->resources->res->count_crtcs; j++) { > > + if (p[i].crtc_id == > > + dev->resources->res->crtcs[j]) { > > + crtc = &dev->resources->crtcs[j]; > > + break; > > + } > > + } > > + if (crtc->crtc->gamma_size) > > + set_gamma(dev, p[i].crtc_id, p[i].fourcc); > > + } > > > > if (atomic_set_plane(dev, &p[i], pattern, update)) > > return; > > @@ -1522,7 +1532,8 @@ static void set_mode(struct device *dev, struct > pipe_arg *pipes, unsigned int co > > return; > > } > > > > - set_gamma(dev, pipe->crtc->crtc->crtc_id, pipe->fourcc); > > + if (pipe->crtc->crtc->gamma_size) > > + set_gamma(dev, pipe->crtc->crtc->crtc_id, > > + pipe->fourcc); > > } > > } > > > > -- > > 2.7.4 > > > > This email and any attachments are intended for the sole use of the named > recipient(s) and contain(s) confidential information that may be proprietary, > privileged or copyrighted under applicable law. If you are not the intended > recipient, do not read, copy, or forward this email message or any attachments. > Delete this email message and any attachments immediately.
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index b907ab3..23ee73d 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1328,14 +1328,24 @@ static int set_plane(struct device *dev, struct plane_arg *p) static void atomic_set_planes(struct device *dev, struct plane_arg *p, unsigned int count, bool update) { - unsigned int i, pattern = primary_fill; + unsigned int i, j, pattern = primary_fill; + struct crtc *crtc = NULL; /* set up planes */ for (i = 0; i < count; i++) { - if (i > 0) + if (i > 0) { pattern = secondary_fill; - else - set_gamma(dev, p[i].crtc_id, p[i].fourcc); + } else { + for (j = 0; j < dev->resources->res->count_crtcs; j++) { + if (p[i].crtc_id == + dev->resources->res->crtcs[j]) { + crtc = &dev->resources->crtcs[j]; + break; + } + } + if (crtc->crtc->gamma_size) + set_gamma(dev, p[i].crtc_id, p[i].fourcc); + } if (atomic_set_plane(dev, &p[i], pattern, update)) return; @@ -1522,7 +1532,8 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co return; } - set_gamma(dev, pipe->crtc->crtc->crtc_id, pipe->fourcc); + if (pipe->crtc->crtc->gamma_size) + set_gamma(dev, pipe->crtc->crtc->crtc_id, pipe->fourcc); } }
Current implementation shows error as "failed to set gamma: Function no implemented" if platform specific drm has no gamma property implemented Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com> --- tests/modetest/modetest.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.