Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10be98a7 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move more GEM objects under gem/ 



Continuing the theme of separating out the GEM clutter.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528092956.14910-8-chris@chris-wilson.co.uk
parent f0e4a063

drivers/gpu/drm/i915/Makefile

+13 −13
Original line number Diff line number Diff line
@@ -87,33 +87,33 @@ i915-y += $(gt-y) 
# GEM (Graphics Execution Management) code

obj-y += gem/

gem-y += \

	gem/i915_gem_clflush.o \

	gem/i915_gem_context.o \

	gem/i915_gem_dmabuf.o \

	gem/i915_gem_domain.o \

	gem/i915_gem_execbuffer.o \

	gem/i915_gem_internal.o \

	gem/i915_gem_object.o \

	gem/i915_gem_mman.o \

	gem/i915_gem_pages.o \

	gem/i915_gem_phys.o \

	gem/i915_gem_shmem.o

	gem/i915_gem_pm.o \

	gem/i915_gem_shmem.o \

	gem/i915_gem_shrinker.o \

	gem/i915_gem_stolen.o \

	gem/i915_gem_tiling.o \

	gem/i915_gem_userptr.o \

	gem/i915_gemfs.o

i915-y += \

	  $(gem-y) \

	  i915_active.o \

	  i915_cmd_parser.o \

	  i915_gem_batch_pool.o \

	  i915_gem_clflush.o \

	  i915_gem_context.o \

	  i915_gem_dmabuf.o \

	  i915_gem_evict.o \

	  i915_gem_execbuffer.o \

	  i915_gem_fence_reg.o \

	  i915_gem_gtt.o \

	  i915_gem_internal.o \

	  i915_gem.o \

	  i915_gem_pm.o \

	  i915_gem_render_state.o \

	  i915_gem_shrinker.o \

	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_gem_userptr.o \

	  i915_gemfs.o \

	  i915_globals.o \

	  i915_query.o \

	  i915_request.o \
@@ -199,10 +199,10 @@ i915-y += dvo_ch7017.o \ 
# Post-mortem debug and GPU hang state capture

i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o

i915-$(CONFIG_DRM_I915_SELFTEST) += \

	gem/selftests/igt_gem_utils.o \

	selftests/i915_random.o \

	selftests/i915_selftest.o \

	selftests/igt_flush_test.o \

	selftests/igt_gem_utils.o \

	selftests/igt_live_test.o \

	selftests/igt_reset.o \

	selftests/igt_spinner.o

drivers/gpu/drm/i915/Makefile.header-test

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ header_test := \ 
	i915_active_types.h \

	i915_debugfs.h \

	i915_drv.h \

	i915_gem_context_types.h \

	i915_gem_pm.h \

	i915_irq.h \

	i915_params.h \

	i915_priolist_types.h \

drivers/gpu/drm/i915/i915_gem_clflush.c→drivers/gpu/drm/i915/gem/i915_gem_clflush.c

+3 −21
Original line number Diff line number Diff line 
/*

 * 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.

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2016 Intel Corporation

 */



#include "i915_drv.h"

#include "intel_frontbuffer.h"

#include "i915_gem_clflush.h"

#include "intel_frontbuffer.h"



static DEFINE_SPINLOCK(clflush_lock);

drivers/gpu/drm/i915/gem/i915_gem_clflush.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2016 Intel Corporation

 */



#ifndef __I915_GEM_CLFLUSH_H__

#define __I915_GEM_CLFLUSH_H__



#include <linux/types.h>



struct drm_i915_private;

struct drm_i915_gem_object;



bool i915_gem_clflush_object(struct drm_i915_gem_object *obj,

			     unsigned int flags);

#define I915_CLFLUSH_FORCE BIT(0)

#define I915_CLFLUSH_SYNC BIT(1)



#endif /* __I915_GEM_CLFLUSH_H__ */

drivers/gpu/drm/i915/i915_gem_context.c→drivers/gpu/drm/i915/gem/i915_gem_context.c

+3 −24
Original line number Diff line number Diff line 
/*

 * Copyright © 2011-2012 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.

 *

 * Authors:

 *    Ben Widawsky <ben@bwidawsk.net>

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2011-2012 Intel Corporation

 */



/*
@@ -92,7 +71,7 @@ 


#include "gt/intel_lrc_reg.h"



#include "i915_drv.h"

#include "i915_gem_context.h"

#include "i915_globals.h"

#include "i915_trace.h"

#include "i915_user_extensions.h"