From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 7/7] drm/i915: Use enum plane instaad of numbers Date: Mon, 31 Mar 2014 19:31:04 +0200 Message-ID: <20140331173104.GW22327@phenom.ffwll.local> References: <1396279290-29435-1-git-send-email-ville.syrjala@linux.intel.com> <1396279290-29435-8-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 193F16E3A0 for ; Mon, 31 Mar 2014 10:31:09 -0700 (PDT) Received: by mail-we0-f180.google.com with SMTP id p61so4981947wes.25 for ; Mon, 31 Mar 2014 10:31:09 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1396279290-29435-8-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Mar 31, 2014 at 06:21:30PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > Change the update_plane() plane checks to use enum plane, and > also fix up the error message to say something that's not total > nonsense. > = > FIXME killing the checks entirely is probably a better idea At least killing the totally outdated SAREA comment would be good ;-) But yeah I really don't see much point in this, especially since we'll happily frob plane C on ilk/snb despite that we're only supporting it on ivb+ really. Looking through git history with git blame it seems like this went defunct somewhere in the large modesetting rewrite. Or even earlier ... in any case very confusing history and ripe for the bin. -Daniel > = > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_display.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index add940c..9a50b64 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2167,11 +2167,11 @@ static int i9xx_update_primary_plane(struct drm_c= rtc *crtc, > u32 reg; > = > switch (plane) { > - case 0: > - case 1: > + case PLANE_A: > + case PLANE_B: > break; > default: > - DRM_ERROR("Can't update plane %c in SAREA\n", plane_name(plane)); > + DRM_ERROR("Can't update plane %c\n", plane_name(plane)); > return -EINVAL; > } > = > @@ -2268,12 +2268,12 @@ static int ironlake_update_primary_plane(struct d= rm_crtc *crtc, > u32 reg; > = > switch (plane) { > - case 0: > - case 1: > - case 2: > + case PLANE_A: > + case PLANE_B: > + case PLANE_C: > break; > default: > - DRM_ERROR("Can't update plane %c in SAREA\n", plane_name(plane)); > + DRM_ERROR("Can't update plane %c\n", plane_name(plane)); > return -EINVAL; > } > = > -- = > 1.8.3.2 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch