forked from Minki/linux
5af9e672b8
i915_gem_request_alloc() uses error pointers. It never returns NULLs. Fixes:0daf0113cf
("drm/i915: Mock infrastructure for request emission") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170413195217.GA26108@mwanda Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commitbe02f75564
) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
64 lines
2.1 KiB
C
64 lines
2.1 KiB
C
/*
|
|
* Copyright © 2016 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#include "mock_engine.h"
|
|
#include "mock_request.h"
|
|
|
|
struct drm_i915_gem_request *
|
|
mock_request(struct intel_engine_cs *engine,
|
|
struct i915_gem_context *context,
|
|
unsigned long delay)
|
|
{
|
|
struct drm_i915_gem_request *request;
|
|
struct mock_request *mock;
|
|
|
|
/* NB the i915->requests slab cache is enlarged to fit mock_request */
|
|
request = i915_gem_request_alloc(engine, context);
|
|
if (IS_ERR(request))
|
|
return NULL;
|
|
|
|
mock = container_of(request, typeof(*mock), base);
|
|
mock->delay = delay;
|
|
|
|
return &mock->base;
|
|
}
|
|
|
|
bool mock_cancel_request(struct drm_i915_gem_request *request)
|
|
{
|
|
struct mock_request *mock = container_of(request, typeof(*mock), base);
|
|
struct mock_engine *engine =
|
|
container_of(request->engine, typeof(*engine), base);
|
|
bool was_queued;
|
|
|
|
spin_lock_irq(&engine->hw_lock);
|
|
was_queued = !list_empty(&mock->link);
|
|
list_del_init(&mock->link);
|
|
spin_unlock_irq(&engine->hw_lock);
|
|
|
|
if (was_queued)
|
|
i915_gem_request_unsubmit(request);
|
|
|
|
return was_queued;
|
|
}
|