lkml.org 
[lkml]   [2011]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] drm/i915: Correctly test for an initialised ring for dri1
On Tue, Jan 18, 2011 at 05:24:09PM +0000, Chris Wilson wrote:
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 46d649b..19a58bd 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1302,12 +1302,12 @@ int i915_irq_emit(struct drm_device *dev, void *data,
> drm_i915_irq_emit_t *emit = data;
> int result;
>
> - if (!dev_priv || !LP_RING(dev_priv)->virtual_start) {
> + if (!dev_priv || !LP_RING(dev_priv)->obj) {
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
> }
>
> - RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
> + LOCK_TEST_WITH_RETURN(dev, file_priv);

While this would surely fix the crash here, this appears to take
away existing functionality with KMS off.

We usually don't require people to upgrade user-space along
with the kernel in order to preserve existing functionality.
Do different rules apply in the DRM area?

Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt


\
 
 \ /
  Last update: 2011-01-19 04:27    [from the cache]
©2003-2011 Jasper Spaans