On Mon, Feb 24, 2014 at 09:11:43PM +0530, sagar.a.kam...@intel.com wrote:
> From: Sagar Kamble <sagar.a.kam...@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.
>
> Testcase: igt/kms_cursor_crc
> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
> Cc: Jani Nikula <jani.nik...@linux.intel.com>
> Cc: David Airlie <airl...@linux.ie>
> Cc: dri-de...@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: G, Pallavi <pallav...@intel.com>
> Signed-off-by: Sagar Kamble <sagar.a.kam...@intel.com>
> ---
> 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 *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;
> +
> + if (width == 64)
> + cntl |= CURSOR_MODE_64_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
> + else if (width == 128)
> + cntl |= CURSOR_MODE_128_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
> + else if (width == 256)
> + cntl |= CURSOR_MODE_256_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
A switch statement might be a bit clearer.
> +
> cntl |= pipe << 28; /* Connect to correct pipe */
> } else {
> cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
> @@ -7439,10 +7447,17 @@ 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;
> +
> + if (width == 64)
> + cntl |= CURSOR_MODE_64_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
> + else if (width == 128)
> + cntl |= CURSOR_MODE_128_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
> + else if (width == 256)
> + cntl |= CURSOR_MODE_256_ARGB_AX |
> MCURSOR_GAMMA_ENABLE;
ditto.
> } else {
> cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
> cntl |= 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 != 64 || height != 64) {
> - DRM_ERROR("we currently only support 64x64 cursors\n");
> + /* Check for which cursor types we support */
> + if ((!(width == 64 && height == 64) && IS_GEN2(dev)) ||
> + (!(width == 64 && height == 64)
> + && !(width == 128 && height == 128)
> + && !(width == 256 && height == 256))) {
I'd make this something like:
if (!((width == 64 && height == 64) ||
(width == 128 && height == 128 && !IS_GEN2(dev)) ||
(width == 256 && height == 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-de...@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel OTC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
