Re: [PATCH v3 1/1] drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support

From: Sagar Arun Kamble
Date: Sat Mar 08 2014 - 14:07:07 EST

On Sun, 2014-03-09 at 00:34 +0530, Sagar Arun Kamble wrote:
> On Sat, 2014-03-08 at 13:51 -0500, Alex Deucher wrote:
> > On Sat, Mar 8, 2014 at 1:49 PM, <sagar.a.kamble@xxxxxxxxx> wrote:
> > > From: Sagar Kamble <sagar.a.kamble@xxxxxxxxx>
> > >
> > > With this patch we allow larger cursor planes of sizes 128x128
> > > and 256x256.
> > >
> > > v2: Added more precise check on size while setting cursor plane.
> > >
> > > v3: Changes related to restructuring cursor size restrictions
> > > and DRM_DEBUG usage.
> > >
> >
> > I'm not sure how useful it is since you appear to be able to
> > selectively adjust the cursor size, but I recently added support for
> > exposing the cursor size as a drm cap:
> > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=8716ed4e7bed4e4c7e3f37940e950ddc0362f450
> >
> > Alex
> Thanks Alex. This is useful for cursor test to enumerate sub-tests based
> on these caps.
Realized after sending mail that we just get to know current cursor
width and height. Can we have capability that exposes all supported
cursor sizes?
> >
> > > Testcase: igt/kms_cursor_crc
> > > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> > > Cc: David Airlie <airlied@xxxxxxxx>
> > > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > > Cc: linux-kernel@xxxxxxxxxxxxxxx
> > > Signed-off-by: G, Pallavi <pallavi.g@xxxxxxxxx>
> > > Signed-off-by: Sagar Kamble <sagar.a.kamble@xxxxxxxxx>
> > > ---
> > > drivers/gpu/drm/i915/i915_reg.h | 4 ++++
> > > drivers/gpu/drm/i915/intel_display.c | 36 +++++++++++++++++++++++++++++++-----
> > > 2 files changed, 35 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > > index 146609a..aee8258 100644
> > > --- a/drivers/gpu/drm/i915/i915_reg.h
> > > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > > @@ -3551,7 +3551,11 @@ enum punit_power_well {
> > > /* 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 0868afb..e59e8fd 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -7440,10 +7440,22 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
> > > bool visible = base != 0;
> > >
> > > if (intel_crtc->cursor_visible != visible) {
> > > + int16_t width = intel_crtc->cursor_width;
> > > uint32_t cntl = I915_READ(CURCNTR(pipe));
> > > if (base) {
> > > cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
> > > - cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > +
> > > + switch (width) {
> > > + case 64:
> > > + cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + case 128:
> > > + cntl |= CURSOR_MODE_128_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + case 256:
> > > + cntl |= CURSOR_MODE_256_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + }
> > > cntl |= pipe << 28; /* Connect to correct pipe */
> > > } else {
> > > cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
> > > @@ -7468,10 +7480,22 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)
> > > bool visible = base != 0;
> > >
> > > if (intel_crtc->cursor_visible != visible) {
> > > + int16_t width = intel_crtc->cursor_width;
> > > uint32_t cntl = I915_READ(CURCNTR_IVB(pipe));
> > > if (base) {
> > > cntl &= ~CURSOR_MODE;
> > > - cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > +
> > > + switch (width) {
> > > + case 64:
> > > + cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + case 128:
> > > + cntl |= CURSOR_MODE_128_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + case 256:
> > > + cntl |= CURSOR_MODE_256_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> > > + break;
> > > + }
> > > } else {
> > > cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
> > > cntl |= CURSOR_MODE_DISABLE;
> > > @@ -7567,9 +7591,11 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> > > goto finish;
> > > }
> > >
> > > - /* Currently we only support 64x64 cursors */
> > > - if (width != 64 || height != 64) {
> > > - DRM_ERROR("we currently only support 64x64 cursors\n");
> > > + /* Check for which cursor types we support */
> > > + if (!((width == 64 && height == 64) ||
> > > + (width == 128 && height == 128 && !IS_GEN2(dev)) ||
> > > + (width == 256 && height == 256 && !IS_GEN2(dev)))) {
> > > + DRM_DEBUG("Cursor dimension not supported\n");
> > > return -EINVAL;
> > > }
> > >
> > > --
> > > 1.8.5
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > > http://lists.freedesktop.org/mailman/listinfo/dri-devel
>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/