From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 1/1] drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support Date: Mon, 24 Feb 2014 18:06:28 +0200 Message-ID: <20140224160628.GU3852@intel.com> References: <20140218131333.GR3852@intel.com> <1393256503-32274-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1393256503-32274-1-git-send-email-sagar.a.kamble@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: sagar.a.kamble@intel.com Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, "G, Pallavi" , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Feb 24, 2014 at 09:11:43PM +0530, sagar.a.kamble@intel.com wrote: > From: Sagar Kamble > = > With this patch we allow larger cursor planes of sizes 128x128 > and 256x256. > = > v2: Added more precise check on size while setting cursor plane. > = > Testcase: igt/kms_cursor_crc > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: David Airlie > Cc: dri-devel@lists.freedesktop.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: G, Pallavi > Signed-off-by: Sagar Kamble > --- > drivers/gpu/drm/i915/i915_reg.h | 4 ++++ > drivers/gpu/drm/i915/intel_display.c | 28 +++++++++++++++++++++++----- > 2 files changed, 27 insertions(+), 5 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_= reg.h > index 2f564ce..2fee3a2 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3522,7 +3522,11 @@ > /* New style CUR*CNTR flags */ > #define CURSOR_MODE 0x27 > #define CURSOR_MODE_DISABLE 0x00 > +#define CURSOR_MODE_128_32B_AX 0x02 > +#define CURSOR_MODE_256_32B_AX 0x03 > #define CURSOR_MODE_64_32B_AX 0x07 > +#define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX) > +#define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX) > #define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) > #define MCURSOR_PIPE_SELECT (1 << 28) > #define MCURSOR_PIPE_A 0x00 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index f19e6ea..d036b41 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -7411,10 +7411,18 @@ static void i9xx_update_cursor(struct drm_crtc *c= rtc, u32 base) > bool visible =3D base !=3D 0; > = > if (intel_crtc->cursor_visible !=3D visible) { > + int16_t width =3D intel_crtc->cursor_width; > uint32_t cntl =3D I915_READ(CURCNTR(pipe)); > if (base) { > cntl &=3D ~(CURSOR_MODE | MCURSOR_PIPE_SELECT); > - cntl |=3D CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + > + if (width =3D=3D 64) > + cntl |=3D CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + else if (width =3D=3D 128) > + cntl |=3D CURSOR_MODE_128_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + else if (width =3D=3D 256) > + cntl |=3D CURSOR_MODE_256_ARGB_AX | MCURSOR_GAMMA_ENABLE; A switch statement might be a bit clearer. > + > cntl |=3D pipe << 28; /* Connect to correct pipe */ > } else { > cntl &=3D ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE); > @@ -7439,10 +7447,17 @@ static void ivb_update_cursor(struct drm_crtc *cr= tc, u32 base) > bool visible =3D base !=3D 0; > = > if (intel_crtc->cursor_visible !=3D visible) { > + int16_t width =3D intel_crtc->cursor_width; > uint32_t cntl =3D I915_READ(CURCNTR_IVB(pipe)); > if (base) { > cntl &=3D ~CURSOR_MODE; > - cntl |=3D CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + > + if (width =3D=3D 64) > + cntl |=3D CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + else if (width =3D=3D 128) > + cntl |=3D CURSOR_MODE_128_ARGB_AX | MCURSOR_GAMMA_ENABLE; > + else if (width =3D=3D 256) > + cntl |=3D CURSOR_MODE_256_ARGB_AX | MCURSOR_GAMMA_ENABLE; ditto. > } else { > cntl &=3D ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE); > cntl |=3D CURSOR_MODE_DISABLE; > @@ -7538,9 +7553,12 @@ static int intel_crtc_cursor_set(struct drm_crtc *= crtc, > goto finish; > } > = > - /* Currently we only support 64x64 cursors */ > - if (width !=3D 64 || height !=3D 64) { > - DRM_ERROR("we currently only support 64x64 cursors\n"); > + /* Check for which cursor types we support */ > + if ((!(width =3D=3D 64 && height =3D=3D 64) && IS_GEN2(dev)) || > + (!(width =3D=3D 64 && height =3D=3D 64) > + && !(width =3D=3D 128 && height =3D=3D 128) > + && !(width =3D=3D 256 && height =3D=3D 256))) { I'd make this something like: if (!((width =3D=3D 64 && height =3D=3D 64) || (width =3D=3D 128 && height =3D=3D 128 && !IS_GEN2(dev)) || (width =3D=3D 256 && height =3D=3D 256 && !IS_GEN2(dev)))) > + DRM_ERROR("Cursor dimension is not supported\n"); Should be DRM_DEBUG() or something. Otherwise the user can spam dmesg by just issuing invalid cursor ioctls. I see we have a bunch of other DRM_ERROR()s for similar stuff in the cursor code. Those should be converted to debugs as well. Maybe you can whip together another patch for that? > return -EINVAL; > } > = > -- = > 1.8.5 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Ville Syrj=E4l=E4 Intel OTC