From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: Re: [PATCH hwc] drm_hwcomposer: fix warnings on unused variables and parameters Date: Thu, 30 Nov 2017 15:33:42 +0100 Message-ID: <1512052422.2107.14.camel@collabora.com> References: <20171129162106.10541-1-robh@kernel.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1784104527==" Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91C186E0F9 for ; Thu, 30 Nov 2017 14:33:46 +0000 (UTC) In-Reply-To: <20171129162106.10541-1-robh@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Rob Herring , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1784104527== Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-v8/59ciOGN8x1qGlYFgm" --=-v8/59ciOGN8x1qGlYFgm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey Rob, I applied and tested this patch, and it looks good to me. Feel free to add my SB/TB. Rob. On Wed, 2017-11-29 at 10:21 -0600, Rob Herring wrote: > AOSP master now builds by default with -Werror, so fix all the > warnings. > All the warnings are related to unused variables and parameters. >=20 > Signed-off-by: Rob Herring > --- > drmcrtc.cpp | 7 +------ > drmcrtc.h | 6 ------ > drmdisplaycompositor.cpp | 3 --- > drmencoder.cpp | 1 - > drmencoder.h | 2 -- > drmhwctwo.cpp | 3 +-- > glworker.cpp | 1 - > platform.cpp | 4 ++-- > 8 files changed, 4 insertions(+), 23 deletions(-) >=20 > diff --git a/drmcrtc.cpp b/drmcrtc.cpp > index c1398699d40d..1b354fe3db61 100644 > --- a/drmcrtc.cpp > +++ b/drmcrtc.cpp > @@ -31,12 +31,7 @@ DrmCrtc::DrmCrtc(DrmResources *drm, drmModeCrtcPtr > c, unsigned pipe) > id_(c->crtc_id), > pipe_(pipe), > display_(-1), > - x_(c->x), > - y_(c->y), > - width_(c->width), > - height_(c->height), > - mode_(&c->mode), > - mode_valid_(c->mode_valid) { > + mode_(&c->mode) { > } > =20 > int DrmCrtc::Init() { > diff --git a/drmcrtc.h b/drmcrtc.h > index 2e8c8118a21d..c5a559968b87 100644 > --- a/drmcrtc.h > +++ b/drmcrtc.h > @@ -54,13 +54,7 @@ class DrmCrtc { > unsigned pipe_; > int display_; > =20 > - uint32_t x_; > - uint32_t y_; > - uint32_t width_; > - uint32_t height_; > - > DrmMode mode_; > - bool mode_valid_; > =20 > DrmProperty active_property_; > DrmProperty mode_property_; > diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp > index dceb78d452c4..acd13b834e2a 100644 > --- a/drmdisplaycompositor.cpp > +++ b/drmdisplaycompositor.cpp > @@ -490,8 +490,6 @@ int > DrmDisplayCompositor::CommitFrame(DrmDisplayComposition > *display_comp, > std::vector &layers =3D display_comp->layers(); > std::vector &comp_planes =3D > display_comp->composition_planes(); > - std::vector &pre_comp_regions =3D > - display_comp->pre_comp_regions(); > uint64_t out_fences[drm_->crtcs().size()]; > =20 > DrmConnector *connector =3D drm_->GetConnectorForDisplay(display_); > @@ -681,7 +679,6 @@ int > DrmDisplayCompositor::CommitFrame(DrmDisplayComposition > *display_comp, > } > } > =20 > -out: > if (!ret) { > uint32_t flags =3D DRM_MODE_ATOMIC_ALLOW_MODESET; > if (test_only) > diff --git a/drmencoder.cpp b/drmencoder.cpp > index 1d4ebdc591ad..3d762f34919d 100644 > --- a/drmencoder.cpp > +++ b/drmencoder.cpp > @@ -27,7 +27,6 @@ DrmEncoder::DrmEncoder(drmModeEncoderPtr e, DrmCrtc > *current_crtc, > const std::vector &possible_crtcs) > : id_(e->encoder_id), > crtc_(current_crtc), > - type_(e->encoder_type), > possible_crtcs_(possible_crtcs) { > } > =20 > diff --git a/drmencoder.h b/drmencoder.h > index ed3c21e1923c..58ccbfbc5004 100644 > --- a/drmencoder.h > +++ b/drmencoder.h > @@ -45,8 +45,6 @@ class DrmEncoder { > uint32_t id_; > DrmCrtc *crtc_; > =20 > - uint32_t type_; > - > std::vector possible_crtcs_; > }; > } > diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp > index 54824b8ce1af..5ab4595bce96 100644 > --- a/drmhwctwo.cpp > +++ b/drmhwctwo.cpp > @@ -242,7 +242,6 @@ HWC2::Error > DrmHwcTwo::HwcDisplay::RegisterVsyncCallback( > =20 > HWC2::Error DrmHwcTwo::HwcDisplay::AcceptDisplayChanges() { > supported(__func__); > - uint32_t num_changes =3D 0; > for (std::pair &l : > layers_) > l.second.accept_type_change(); > return HWC2::Error::None; > @@ -614,7 +613,7 @@ HWC2::Error > DrmHwcTwo::HwcDisplay::SetActiveConfig(hwc2_config_t config) { > HWC2::Error DrmHwcTwo::HwcDisplay::SetClientTarget(buffer_handle_t > target, > int32_t > acquire_fence, > int32_t > dataspace, > - hwc_region_t > damage) { > + hwc_region_t > /*damage*/) { > supported(__func__); > UniqueFd uf(acquire_fence); > =20 > diff --git a/glworker.cpp b/glworker.cpp > index e90576a75f1a..ca726bf573ba 100644 > --- a/glworker.cpp > +++ b/glworker.cpp > @@ -478,7 +478,6 @@ int GLWorkerCompositor::Init() { > const char *egl_extensions; > const char *gl_extensions; > EGLint num_configs; > - EGLint attribs[] =3D {EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE, > EGL_NONE}; > EGLConfig egl_config; > =20 > // clang-format off > diff --git a/platform.cpp b/platform.cpp > index e920872fa180..56ab37e12d94 100644 > --- a/platform.cpp > +++ b/platform.cpp > @@ -142,8 +142,8 @@ int PlanStageProtected::ProvisionPlanes( > =20 > int PlanStagePrecomp::ProvisionPlanes( > std::vector *composition, > - std::map &layers, DrmCrtc *crtc, > - std::vector *planes) { > + std::map &layers, DrmCrtc * /*crtc*/, > + std::vector * /*planes*/) { > DrmCompositionPlane *precomp =3D GetPrecomp(composition); > if (!precomp || precomp->source_layers().empty()) > return 0; --=-v8/59ciOGN8x1qGlYFgm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJaIBbGAAoJELeaC2oR7vcnQ5IP/3UpEsSGDpvrKMYDesHDjeDY fPf5ehBlREE/HdpsQdLVMDuS1XPnVLyvYgWiM+Jrkgy10cfGybOT7Ola25RP/Qru 5wA/P+Sttl14AwnKdJJeq6n3qxmKg3d8CQJ1xQnsqTsGlqdlwK+MYyAZOYzsC4yV TQhVSXyhlCgSa6giALjlDQ0WW+rnrpFFd//ovNOk1rRke7KDMuagtZw3WQODBHut FWg/4EtBBGsi16W8144Mqp5rO8PrOzycE2OOVFiu8VrOsKMIDURRPaUdc1ZcGTps oxT/1XFF9orgELFUHkyQ1vw8hNThZZ5Uer7/MZM1UrdqwJSfucL6ltcMltKe+NcR xD4eNifqfMRDkpKrgExgwa1INp9/zvb+V2LCqvIFf5Ox5DHWvL2crV+PNZlyp/0T 4SdK6yr/cq+3WE5KPAKXDGg99YqG2f/rewdiBYz4mOJyd9o9+ax+3BC3t19dl62X pRrpapBghlrpYDPZSJA7dzJC2cBbY9Lsh4o5sdC7jMB36GZFDWpW0Y5qG9rpBOaH gaYksYg9qPoCijuXIzJz/k30jyLzn6/kKUQavm7UiwXx3pktz05ziQuQW193EVmT Gex/KQoQBKSJB4DPj4oHM5SRdCrDWxaL1nKK3tjN8sgWcKJnEu5/BREpr/MC7+vo RD/Zx4HyFCXmts4YO+qW =/Md+ -----END PGP SIGNATURE----- --=-v8/59ciOGN8x1qGlYFgm-- --===============1784104527== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1784104527==--