From: Sagar Arun Kamble <sagar.a.kamble@intel.com>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
LKML <linux-kernel@vger.kernel.org>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
"G, Pallavi" <pallavi.g@intel.com>
Subject: Re: [PATCH v3 1/1] drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support
Date: Sun, 09 Mar 2014 00:37:49 +0530 [thread overview]
Message-ID: <1394305669.18918.3.camel@sagar-desktop> (raw)
In-Reply-To: <1394305472.18918.1.camel@sagar-desktop>
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@intel.com> wrote:
> > > From: Sagar Kamble <sagar.a.kamble@intel.com>
> > >
> > > 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@ffwll.ch>
> > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > > Cc: David Airlie <airlied@linux.ie>
> > > Cc: dri-devel@lists.freedesktop.org
> > > Cc: linux-kernel@vger.kernel.org
> > > Signed-off-by: G, Pallavi <pallavi.g@intel.com>
> > > Signed-off-by: Sagar Kamble <sagar.a.kamble@intel.com>
> > > ---
> > > 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@lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
next prev parent reply other threads:[~2014-03-08 19:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-18 10:09 [PATCH 1/1] drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support sagar.a.kamble
2014-02-18 13:13 ` Ville Syrjälä
2014-02-24 15:41 ` [PATCH v2 " sagar.a.kamble
2014-02-24 16:06 ` Ville Syrjälä
2014-03-08 18:49 ` [PATCH v3 " sagar.a.kamble
2014-03-08 18:51 ` Alex Deucher
2014-03-08 19:04 ` Sagar Arun Kamble
2014-03-08 19:07 ` Sagar Arun Kamble [this message]
2014-03-10 9:29 ` [Intel-gfx] " Chris Wilson
2014-03-10 9:55 ` Daniel Vetter
2014-03-10 10:04 ` Chris Wilson
2014-03-10 10:07 ` Daniel Vetter
2014-03-10 10:39 ` Daniel Vetter
2014-03-10 10:03 ` Daniel Vetter
2014-03-10 11:36 ` [PATCH v4 " sagar.a.kamble
2014-03-17 5:47 ` Sagar Arun Kamble
2014-03-20 15:30 ` Imre Deak
2014-03-20 16:35 ` Daniel Vetter
2014-03-20 15:37 ` Imre Deak
2014-02-25 11:35 ` [PATCH " Thierry Reding
2014-02-25 11:56 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394305669.18918.3.camel@sagar-desktop \
--to=sagar.a.kamble@intel.com \
--cc=alexdeucher@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pallavi.g@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox