GEM object create and driver init dev_priv cleanups
Subsystems (2)
Tvrtko Ursulin
maintainercover GEM object create and driver init dev_priv cleanups
From: Tvrtko Ursulin <[email protected]>
Autumn of churn continues. :)
This series tidies GEM object construction to take dev_priv instead of dev in all cases and also does a bit of random tidy in the driver load/init code.
Basically functions which only need dev_priv are changed to take dev_priv instead of dev. There is often a cascade effect and the end result is a saving in lines of code. And even in binary occasionally but not worth much mention.
Tvrtko Ursulin (10):
drm/i915: Make GEM object alloc/free and stolen created take dev_priv drm/i915: Make GEM object create and create from data take dev_priv drm/i915: Make various init functions take dev_priv drm/i915: More GEM init dev_priv cleanup
drm/i915: dev_priv cleanup in bridge/bar/mmio init code drm/i915: Unexport VGA switcheroo functions
drm/i915: Make gmbus setup take dev_priv
drm/i915: Make i915_destroy_error_state take dev_priv drm/i915: Make i915_save/restore_state and intel_i2c_reset take
dev_priv
drm/i915: Make intel_pm_setup take dev_priv
drivers/gpu/drm/i915/i915_debugfs.c | 8 +-- drivers/gpu/drm/i915/i915_drv.c | 108 +++++++++++++---------------- drivers/gpu/drm/i915/i915_drv.h | 63 +++++++++-------- drivers/gpu/drm/i915/i915_gem.c | 72 ++++++++----------- drivers/gpu/drm/i915/i915_gem_context.c | 39 +++++------ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_gem_internal.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 21 +++--- drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- drivers/gpu/drm/i915/i915_guc_submission.c | 12 ++-- drivers/gpu/drm/i915/i915_perf.c | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 22 +++--- drivers/gpu/drm/i915/i915_sysfs.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 6 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 7 +- drivers/gpu/drm/i915/intel_fbdev.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 36 +++++----- drivers/gpu/drm/i915/intel_i2c.c | 16 ++--- drivers/gpu/drm/i915/intel_lrc.c | 4 +- drivers/gpu/drm/i915/intel_lrc.h | 2 +- drivers/gpu/drm/i915/intel_mocs.c | 5 +- drivers/gpu/drm/i915/intel_mocs.h | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 5 +- drivers/gpu/drm/i915/intel_pm.c | 8 +-- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +- drivers/gpu/drm/i915/intel_uc.h | 10 +-- 28 files changed, 214 insertions(+), 261 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 1/10 drm/i915: Make GEM object alloc/free and stolen created take dev_priv
From: Tvrtko Ursulin <[email protected]>
Where it is more appropriate and also to be consistent with the direction of the driver.
Also inline object alloc/free since they are just wrappers around kmem_cache_alloc/free.
--- drivers/gpu/drm/i915/i915_drv.h | 17 +++++++++++++---- drivers/gpu/drm/i915/i915_gem.c | 14 +------------- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_gem_internal.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 21 +++++++++------------ drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 3 +-- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 12 files changed, 33 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -4
@@ -2976,8 +2976,17 @@ void i915_gem_load_init_fences(struct drm_i915_private *dev_priv);int i915_gem_freeze (struct drm_i915_private *dev_priv);int i915_gem_freeze_late (struct drm_i915_private *dev_priv); -void *i915_gem_object_alloc (struct drm_device *dev); -void i915_gem_object_free (struct drm_i915_gem_object *obj); +static inline void *i915_gem_object_alloc (struct drm_i915_private *dev_priv) +{ +return kmem_cache_zalloc (dev_priv->objects,GFP_KERNEL ); +} + +static inline void i915_gem_object_free (struct drm_i915_gem_object *obj) +{ +struct drm_i915_private *dev_priv =to_i915 (obj->base.dev); +kmem_cache_free (dev_priv->objects, obj); +} +void i915_gem_object_init (struct drm_i915_gem_object *obj,const struct drm_i915_gem_object_ops *ops); struct drm_i915_gem_object *i915_gem_object_create(struct drm_device *dev,
@@ -3361,9 +3370,9 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,int i915_gem_init_stolen (struct drm_i915_private *dev_priv);void i915_gem_cleanup_stolen (struct drm_device *dev);struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_device *dev,u32 size); +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,u32 size);struct drm_i915_gem_object * -i915_gem_object_create_stolen_for_preallocated (struct drm_device *dev, +i915_gem_object_create_stolen_for_preallocated (struct drm_i915_private *dev_priv,u32 stolen_offset,u32 gtt_offset,u32 size);
drivers/gpu/drm/i915/i915_gem.c +1 -13
@@ -622,18 +622,6 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,return ret; } -void *i915_gem_object_alloc (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv =to_i915 (dev); -return kmem_cache_zalloc (dev_priv->objects,GFP_KERNEL ); -} - -void i915_gem_object_free (struct drm_i915_gem_object *obj) -{ -struct drm_i915_private *dev_priv =to_i915 (obj->base.dev); -kmem_cache_free (dev_priv->objects, obj); -} - static int i915_gem_create(struct drm_file *file, struct drm_device *dev,
@@ -3990,7 +3978,7 @@ i915_gem_object_create(struct drm_device *dev, u64 size)if (overflows_type (size, obj->base.size))return ERR_PTR (-E2BIG ); - obj =i915_gem_object_alloc (dev); + obj =i915_gem_object_alloc (dev_priv);if (obj ==NULL )return ERR_PTR (-ENOMEM );
drivers/gpu/drm/i915/i915_gem_dmabuf.c +1 -1
@@ -278,7 +278,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,get_dma_buf (dma_buf); - obj =i915_gem_object_alloc (dev); + obj =i915_gem_object_alloc (to_i915 (dev));if (obj ==NULL ) { ret = -ENOMEM ; goto fail_detach;
drivers/gpu/drm/i915/i915_gem_internal.c +1 -1
@@ -155,7 +155,7 @@ i915_gem_object_create_internal(struct drm_i915_private *i915, {struct drm_i915_gem_object *obj; - obj =i915_gem_object_alloc (&i915->drm); + obj =i915_gem_object_alloc (i915);if (!obj)return ERR_PTR (-ENOMEM );
drivers/gpu/drm/i915/i915_gem_stolen.c +9 -12
@@ -579,22 +579,21 @@ static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = { };static struct drm_i915_gem_object * -_i915_gem_object_create_stolen (struct drm_device *dev, +_i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,struct drm_mm_node *stolen) {struct drm_i915_gem_object *obj; - obj =i915_gem_object_alloc (dev); + obj =i915_gem_object_alloc (dev_priv);if (obj ==NULL )return NULL ; -drm_gem_private_object_init (dev, &obj->base, stolen->size); +drm_gem_private_object_init (&dev_priv->drm, &obj->base, stolen->size);i915_gem_object_init (obj, &i915_gem_object_stolen_ops); obj->stolen = stolen; obj->base.read_domains =I915_GEM_DOMAIN_CPU |I915_GEM_DOMAIN_GTT ; - obj->cache_level =HAS_LLC (to_i915 (dev)) ? -I915_CACHE_LLC :I915_CACHE_NONE ; + obj->cache_level =HAS_LLC (dev_priv) ?I915_CACHE_LLC :I915_CACHE_NONE ;if (i915_gem_object_pin_pages (obj)) goto cleanup;
@@ -607,9 +606,8 @@ _i915_gem_object_create_stolen(struct drm_device *dev, }struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_device *dev,u32 size) +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,u32 size) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;int ret;
@@ -630,7 +628,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size)return NULL ; } - obj =_i915_gem_object_create_stolen (dev, stolen); + obj =_i915_gem_object_create_stolen (dev_priv, stolen);if (obj)return obj;
@@ -640,12 +638,11 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size) }struct drm_i915_gem_object * -i915_gem_object_create_stolen_for_preallocated (struct drm_device *dev, +i915_gem_object_create_stolen_for_preallocated (struct drm_i915_private *dev_priv,u32 stolen_offset,u32 gtt_offset,u32 size) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_ggtt *ggtt = &dev_priv->ggtt;struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;
@@ -655,7 +652,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,if (!drm_mm_initialized (&dev_priv->mm.stolen))return NULL ; -lockdep_assert_held (&dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex);DRM_DEBUG_KMS ("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n" , stolen_offset, gtt_offset, size);
@@ -680,7 +677,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,return NULL ; } - obj =_i915_gem_object_create_stolen (dev, stolen); + obj =_i915_gem_object_create_stolen (dev_priv, stolen);if (obj ==NULL ) {DRM_DEBUG_KMS ("failed to allocate stolen object\n" );i915_gem_stolen_remove_node (dev_priv, stolen);
drivers/gpu/drm/i915/i915_gem_userptr.c +1 -1
@@ -784,7 +784,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *filereturn -ENODEV ; } - obj =i915_gem_object_alloc (dev); + obj =i915_gem_object_alloc (dev_priv);if (obj ==NULL )return -ENOMEM ;
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -2689,7 +2689,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,mutex_lock (&dev->struct_mutex); - obj =i915_gem_object_create_stolen_for_preallocated (dev, + obj =i915_gem_object_create_stolen_for_preallocated (dev_priv, base_aligned, base_aligned, size_aligned);
drivers/gpu/drm/i915/intel_engine_cs.c +1 -1
@@ -257,7 +257,7 @@ int intel_engine_create_scratch(struct intel_engine_cs *engine, int size)WARN_ON (engine->scratch); - obj =i915_gem_object_create_stolen (&engine->i915->drm, size); + obj =i915_gem_object_create_stolen (engine->i915, size);if (!obj) obj =i915_gem_object_create_internal (engine->i915, size);if (IS_ERR (obj)) {
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
@@ -145,7 +145,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,* important and we should probably use that space with FBC or other * features. */ if (size *2 < ggtt->stolen_usable_size) - obj =i915_gem_object_create_stolen (dev, size); + obj =i915_gem_object_create_stolen (dev_priv, size);if (obj ==NULL ) obj =i915_gem_object_create (dev, size);if (IS_ERR (obj)) {
drivers/gpu/drm/i915/intel_overlay.c +1 -2
@@ -1391,8 +1391,7 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv) reg_bo =NULL ;if (!OVERLAY_NEEDS_PHYSICAL (dev_priv)) - reg_bo =i915_gem_object_create_stolen (&dev_priv->drm, -PAGE_SIZE ); + reg_bo =i915_gem_object_create_stolen (dev_priv,PAGE_SIZE );if (reg_bo ==NULL ) reg_bo =i915_gem_object_create (&dev_priv->drm,PAGE_SIZE );if (IS_ERR (reg_bo))
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -5805,7 +5805,7 @@ static void valleyview_setup_pctx(struct drm_i915_private *dev_priv)int pcbr_offset; pcbr_offset = (pcbr & (~4095 )) - dev_priv->mm.stolen_base; - pctx =i915_gem_object_create_stolen_for_preallocated (&dev_priv->drm, + pctx =i915_gem_object_create_stolen_for_preallocated (dev_priv, pcbr_offset,I915_GTT_OFFSET_NONE , pctx_size);
@@ -5822,7 +5822,7 @@ static void valleyview_setup_pctx(struct drm_i915_private *dev_priv)* overlap with other ranges, such as the frame buffer, protected * memory, or any other relevant ranges. */ - pctx =i915_gem_object_create_stolen (&dev_priv->drm, pctx_size); + pctx =i915_gem_object_create_stolen (dev_priv, pctx_size);if (!pctx) {DRM_DEBUG ("not enough stolen space for PCTX, disabling\n" ); goto out;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -1869,7 +1869,7 @@ intel_ring_create_vma(struct drm_i915_private *dev_priv, int size)struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =i915_gem_object_create_stolen (&dev_priv->drm, size); + obj =i915_gem_object_create_stolen (dev_priv, size);if (!obj) obj =i915_gem_object_create (&dev_priv->drm, size);if (IS_ERR (obj))
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] drm/i915: Make GEM object alloc/free and stolen created take dev_priv
Quoted 9 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Where it is more appropriate and also to be consistent with the direction of the driver.
Also inline object alloc/free since they are just wrappers around kmem_cache_alloc/free.
Signed-off-by Tvrtko Ursulin <[email protected]>
<SNIP>
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2976,8 +2976,17 @@ void i915_gem_load_init_fences(struct drm_i915_private *dev_priv); int i915_gem_freeze(struct drm_i915_private *dev_priv); int i915_gem_freeze_late(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_drv.h +0
-2-void *i915_gem_object_alloc (struct drm_device *dev); -void i915_gem_object_free (struct drm_i915_gem_object *obj);
drivers/gpu/drm/i915/i915_drv.h void i915_gem_load_init_fences(struct drm_i915_private *dev_priv); · line 2988
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +10
-0+static inline void *i915_gem_object_alloc (struct drm_i915_private *dev_priv) +{ +return kmem_cache_zalloc (dev_priv->objects,GFP_KERNEL ); +} + +static inline void i915_gem_object_free (struct drm_i915_gem_object *obj) +{ +struct drm_i915_private *dev_priv =to_i915 (obj->base.dev); +kmem_cache_free (dev_priv->objects, obj); +}
Split this change into a separate patch, and untangle enough to relocate to i915_gem_object.h.
Rest of the functions should be moved too.
Just the dev_priv changes are;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 2/10 drm/i915: Make GEM object create and create from data take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Makes all GEM object constructors consistent.
--- drivers/gpu/drm/i915/i915_drv.h | 9 +++++---- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++---------- drivers/gpu/drm/i915/i915_gem_context.c | 5 +++-- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_perf.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 5 +++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 11 files changed, 30 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -4
@@ -2989,10 +2989,11 @@ static inline void i915_gem_object_free(struct drm_i915_gem_object *obj)void i915_gem_object_init (struct drm_i915_gem_object *obj,const struct drm_i915_gem_object_ops *ops); -struct drm_i915_gem_object *i915_gem_object_create (struct drm_device *dev, -u64 size); -struct drm_i915_gem_object *i915_gem_object_create_from_data ( -struct drm_device *dev,const void *data,size_t size); +struct drm_i915_gem_object * +i915_gem_object_create (struct drm_i915_private *dev_priv,u64 size); +struct drm_i915_gem_object * +i915_gem_object_create_from_data (struct drm_i915_private *dev_priv, +const void *data,size_t size);void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file);void i915_gem_free_object (struct drm_gem_object *obj);
drivers/gpu/drm/i915/i915_gem.c +10 -10
@@ -624,7 +624,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,static int i915_gem_create (struct drm_file *file, -struct drm_device *dev, +struct drm_i915_private *dev_priv,uint64_t size,uint32_t *handle_p) {
@@ -637,7 +637,7 @@ i915_gem_create(struct drm_file *file,return -EINVAL ;/* Allocate the new object */ - obj =i915_gem_object_create (dev, size); + obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj))return PTR_ERR (obj);
@@ -659,7 +659,7 @@ i915_gem_dumb_create(struct drm_file *file,/* have to work out size/pitch and return them */ args->pitch =ALIGN (args->width *DIV_ROUND_UP (args->bpp,8 ),64 ); args->size = args->pitch * args->height; -return i915_gem_create (file, dev, +return i915_gem_create (file,to_i915 (dev), args->size, &args->handle); }
@@ -673,11 +673,12 @@ int i915_gem_create_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { + struct drm_i915_private *dev_priv = to_i915(dev);struct drm_i915_gem_create *args = data; -i915_gem_flush_free_objects (to_i915 (dev)); +i915_gem_flush_free_objects (dev_priv); -return i915_gem_create (file, dev, +return i915_gem_create (file, dev_priv, args->size, &args->handle); }
@@ -3959,9 +3960,8 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = { (sizeof(x) > sizeof(T) && (x) >> (sizeof(T) * BITS_PER_BYTE))struct drm_i915_gem_object * -i915_gem_object_create (struct drm_device *dev,u64 size) +i915_gem_object_create (struct drm_i915_private *dev_priv,u64 size) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_gem_object *obj;struct address_space *mapping;gfp_t mask;
@@ -3982,7 +3982,7 @@ i915_gem_object_create(struct drm_device *dev, u64 size)if (obj ==NULL )return ERR_PTR (-ENOMEM ); - ret =drm_gem_object_init (dev, &obj->base, size); + ret =drm_gem_object_init (&dev_priv->drm, &obj->base, size);if (ret) goto fail;
@@ -4738,7 +4738,7 @@ void i915_gem_track_fb(struct drm_i915_gem_object *old,/* Allocate a new GEM object and fill it with the supplied data */ struct drm_i915_gem_object * -i915_gem_object_create_from_data (struct drm_device *dev, +i915_gem_object_create_from_data (struct drm_i915_private *dev_priv,const void *data,size_t size) {struct drm_i915_gem_object *obj;
@@ -4746,7 +4746,7 @@ i915_gem_object_create_from_data(struct drm_device *dev,size_t bytes;int ret; - obj =i915_gem_object_create (dev,round_up (size,PAGE_SIZE )); + obj =i915_gem_object_create (dev_priv,round_up (size,PAGE_SIZE ));if (IS_ERR (obj))return obj;
drivers/gpu/drm/i915/i915_gem_context.c +3 -2
@@ -169,12 +169,13 @@ void i915_gem_context_free(struct kref *ctx_ref)static struct drm_i915_gem_object *alloc_context_obj (struct drm_device *dev,u64 size) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_gem_object *obj;int ret;lockdep_assert_held (&dev->struct_mutex); - obj =i915_gem_object_create (dev, size); + obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj))return obj;
@@ -193,7 +194,7 @@ alloc_context_obj(struct drm_device *dev, u64 size)* This is only applicable for Ivy Bridge devices since * later platforms don't have L3 control bits in the PTE. */ -if (IS_IVYBRIDGE (to_i915 (dev))) { +if (IS_IVYBRIDGE (dev_priv)) { ret =i915_gem_object_set_cache_level (obj,I915_CACHE_L3_LLC );/* Failure shouldn't ever happen this early */ if (WARN_ON (ret)) {
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -574,7 +574,7 @@ static struct i915_vma *guc_allocate_vma(struct intel_guc *guc, u32 size)struct i915_vma *vma;int ret; - obj =i915_gem_object_create (&dev_priv->drm, size); + obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj))return ERR_CAST (obj);
drivers/gpu/drm/i915/i915_perf.c +1 -1
@@ -773,7 +773,7 @@ static int alloc_oa_buffer(struct drm_i915_private *dev_priv)BUILD_BUG_ON_NOT_POWER_OF_2 (OA_BUFFER_SIZE );BUILD_BUG_ON (OA_BUFFER_SIZE <SZ_128K ||OA_BUFFER_SIZE >SZ_16M ); - bo =i915_gem_object_create (&dev_priv->drm,OA_BUFFER_SIZE ); + bo =i915_gem_object_create (dev_priv,OA_BUFFER_SIZE );if (IS_ERR (bo)) {DRM_ERROR ("Failed to allocate OA buffer\n" ); ret =PTR_ERR (bo);
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -10998,7 +10998,7 @@ intel_framebuffer_create_for_mode(struct drm_device *dev,struct drm_i915_gem_object *obj;struct drm_mode_fb_cmd2 mode_cmd = {0 }; - obj =i915_gem_object_create (dev, + obj =i915_gem_object_create (to_i915 (dev),intel_framebuffer_size_for_mode (mode, bpp));if (IS_ERR (obj))return ERR_CAST (obj);
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
@@ -147,7 +147,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,if (size *2 < ggtt->stolen_usable_size) obj =i915_gem_object_create_stolen (dev_priv, size);if (obj ==NULL ) - obj =i915_gem_object_create (dev, size); + obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj)) {DRM_ERROR ("failed to allocate framebuffer\n" ); ret =PTR_ERR (obj);
drivers/gpu/drm/i915/intel_guc_loader.c +3 -2
@@ -590,6 +590,7 @@ int intel_guc_setup(struct drm_device *dev)static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev = dev->pdev;struct drm_i915_gem_object *obj;const struct firmware *fw =NULL ;
@@ -648,7 +649,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* Header and uCode will be loaded to WOPCM. Size of the two. */ size = guc_fw->header_size + guc_fw->ucode_size; -if (size >guc_wopcm_size (to_i915 (dev))) { +if (size >guc_wopcm_size (dev_priv)) {DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail; }
@@ -676,7 +677,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted);mutex_lock (&dev->struct_mutex); - obj =i915_gem_object_create_from_data (dev, fw->data, fw->size); + obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size);mutex_unlock (&dev->struct_mutex);if (IS_ERR_OR_NULL (obj)) { err = obj ?PTR_ERR (obj) : -ENOMEM ;
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -1243,7 +1243,7 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)struct i915_vma *vma;int err; - obj =i915_gem_object_create (&engine->i915->drm,PAGE_ALIGN (size)); + obj =i915_gem_object_create (engine->i915,PAGE_ALIGN (size));if (IS_ERR (obj))return PTR_ERR (obj);
@@ -2242,7 +2242,7 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,/* One extra page as the sharing data between driver and GuC */ context_size +=PAGE_SIZE *LRC_PPHWSP_PN ; - ctx_obj =i915_gem_object_create (&ctx->i915->drm, context_size); + ctx_obj =i915_gem_object_create (ctx->i915, context_size);if (IS_ERR (ctx_obj)) {DRM_DEBUG_DRIVER ("Alloc LRC backing obj failed.\n" );return PTR_ERR (ctx_obj);
drivers/gpu/drm/i915/intel_overlay.c +1 -1
@@ -1393,7 +1393,7 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv)if (!OVERLAY_NEEDS_PHYSICAL (dev_priv)) reg_bo =i915_gem_object_create_stolen (dev_priv,PAGE_SIZE );if (reg_bo ==NULL ) - reg_bo =i915_gem_object_create (&dev_priv->drm,PAGE_SIZE ); + reg_bo =i915_gem_object_create (dev_priv,PAGE_SIZE );if (IS_ERR (reg_bo)) goto out_free; overlay->reg_bo = reg_bo;
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -1871,7 +1871,7 @@ intel_ring_create_vma(struct drm_i915_private *dev_priv, int size) obj =i915_gem_object_create_stolen (dev_priv, size);if (!obj) - obj =i915_gem_object_create (&dev_priv->drm, size); + obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj))return ERR_CAST (obj);
@@ -2452,7 +2452,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=8 && !dev_priv->semaphore) {struct i915_vma *vma; - obj =i915_gem_object_create (&dev_priv->drm,4096 ); + obj =i915_gem_object_create (dev_priv,4096 );if (IS_ERR (obj)) goto err;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/10] drm/i915: Make GEM object create and create from data take dev_priv
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Makes all GEM object constructors consistent.
Signed-off-by Tvrtko Ursulin <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 3/10 drm/i915: Make various init functions take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Like GEM init, GUC init, MOCS init and context creation.
Enables them to lose dev_priv locals.
--- drivers/gpu/drm/i915/i915_drv.c | 31 ++++++++++++++-------------- drivers/gpu/drm/i915/i915_drv.h | 10 ++++----- drivers/gpu/drm/i915/i915_gem.c | 28 ++++++++++++------------- drivers/gpu/drm/i915/i915_gem_context.c | 31 +++++++++++++--------------- drivers/gpu/drm/i915/i915_guc_submission.c | 10 ++++----- drivers/gpu/drm/i915/intel_engine_cs.c | 5 ++--- drivers/gpu/drm/i915/intel_guc_loader.c | 33 ++++++++++++++---------------- drivers/gpu/drm/i915/intel_lrc.h | 2 +- drivers/gpu/drm/i915/intel_mocs.c | 5 ++--- drivers/gpu/drm/i915/intel_mocs.h | 2 +- drivers/gpu/drm/i915/intel_uc.h | 10 ++++----- 11 files changed, 77 insertions(+), 90 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +15 -16
@@ -603,9 +603,9 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; -intel_guc_init (dev); +intel_guc_init (dev_priv); - ret =i915_gem_init (dev); + ret =i915_gem_init (dev_priv);if (ret) goto cleanup_irq;
@@ -626,11 +626,11 @@ static int i915_load_modeset_init(struct drm_device *dev)return 0 ; cleanup_gem: -if (i915_gem_suspend (dev)) +if (i915_gem_suspend (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: -intel_guc_fini (dev); +intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev); cleanup_csr:
@@ -1290,7 +1290,7 @@ void i915_driver_unload(struct drm_device *dev)intel_fbdev_fini (dev); -if (i915_gem_suspend (dev)) +if (i915_gem_suspend (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );intel_display_power_get (dev_priv,POWER_DOMAIN_INIT );
@@ -1327,7 +1327,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); -intel_guc_fini (dev); +intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);
@@ -1432,14 +1432,14 @@ static int i915_drm_suspend(struct drm_device *dev)pci_save_state (pdev); - error =i915_gem_suspend (dev); + error =i915_gem_suspend (dev_priv);if (error) {dev_err (&pdev->dev,"GEM idle failed, resume might fail\n" ); goto out; } -intel_guc_suspend (dev); +intel_guc_suspend (dev_priv);intel_display_suspend (dev);
@@ -1575,7 +1575,7 @@ static int i915_drm_resume(struct drm_device *dev)intel_csr_ucode_resume (dev_priv); -i915_gem_resume (dev); +i915_gem_resume (dev_priv);i915_restore_state (dev);intel_pps_unlock_regs_wa (dev_priv);
@@ -1595,13 +1595,13 @@ static int i915_drm_resume(struct drm_device *dev)intel_runtime_pm_enable_interrupts (dev_priv);mutex_lock (&dev->struct_mutex); -if (i915_gem_init_hw (dev)) { +if (i915_gem_init_hw (dev_priv)) {DRM_ERROR ("failed to re-initialize GPU, declaring wedged!\n" );i915_gem_set_wedged (dev_priv); }mutex_unlock (&dev->struct_mutex); -intel_guc_resume (dev); +intel_guc_resume (dev_priv);intel_modeset_init_hw (dev);
@@ -1774,11 +1774,10 @@ static void enable_engines_irq(struct drm_i915_private *dev_priv)*/ void i915_reset (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;struct i915_gpu_error *error = &dev_priv->gpu_error;int ret; -lockdep_assert_held (&dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex);if (!test_and_clear_bit (I915_RESET_IN_PROGRESS , &error->flags))return ;
@@ -1818,7 +1817,7 @@ void i915_reset(struct drm_i915_private *dev_priv)* was running at the time of the reset (i.e. we weren't VT * switched away). */ - ret =i915_gem_init_hw (dev); + ret =i915_gem_init_hw (dev_priv);if (ret) {DRM_ERROR ("Failed hw init on reset %d\n" , ret); goto error;
@@ -2332,7 +2331,7 @@ static int intel_runtime_suspend(struct device *kdev)*/ i915_gem_runtime_suspend (dev_priv); -intel_guc_suspend (dev); +intel_guc_suspend (dev_priv);intel_runtime_pm_disable_interrupts (dev_priv);
@@ -2417,7 +2416,7 @@ static int intel_runtime_resume(struct device *kdev)if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" ); -intel_guc_resume (dev); +intel_guc_resume (dev_priv);if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +5 -5
@@ -3181,14 +3181,14 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)void i915_gem_reset (struct drm_i915_private *dev_priv);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);void i915_gem_clflush_object (struct drm_i915_gem_object *obj,bool force); -int __must_check i915_gem_init (struct drm_device *dev); -int __must_check i915_gem_init_hw (struct drm_device *dev); +int __must_check i915_gem_init (struct drm_i915_private *dev_priv); +int __must_check i915_gem_init_hw (struct drm_i915_private *dev_priv);void i915_gem_init_swizzling (struct drm_i915_private *dev_priv);void i915_gem_cleanup_engines (struct drm_device *dev);int __must_check i915_gem_wait_for_idle (struct drm_i915_private *dev_priv,unsigned int flags); -int __must_check i915_gem_suspend (struct drm_device *dev); -void i915_gem_resume (struct drm_device *dev); +int __must_check i915_gem_suspend (struct drm_i915_private *dev_priv); +void i915_gem_resume (struct drm_i915_private *dev_priv);int i915_gem_fault (struct vm_area_struct *vma,struct vm_fault *vmf); int i915_gem_object_wait(struct drm_i915_gem_object *obj, unsigned int flags,
@@ -3271,7 +3271,7 @@ void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, struct sg_table *pages);/* i915_gem_context.c */ -int __must_check i915_gem_context_init (struct drm_device *dev); +int __must_check i915_gem_context_init (struct drm_i915_private *dev_priv);void i915_gem_context_lost (struct drm_i915_private *dev_priv);void i915_gem_context_fini (struct drm_device *dev);int i915_gem_context_open (struct drm_device *dev,struct drm_file *file);
drivers/gpu/drm/i915/i915_gem.c +13 -15
@@ -4183,9 +4183,9 @@ static void assert_kernel_context_is_current(struct drm_i915_private *dev_priv)GEM_BUG_ON (engine->last_context != dev_priv->kernel_context); } -int i915_gem_suspend (struct drm_device *dev) +int i915_gem_suspend (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;int ret;intel_suspend_gt_powersave (dev_priv);
@@ -4259,9 +4259,9 @@ int i915_gem_suspend(struct drm_device *dev)return ret; } -void i915_gem_resume (struct drm_device *dev) +void i915_gem_resume (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;WARN_ON (dev_priv->gt.awake);
@@ -4326,9 +4326,8 @@ static void init_unused_rings(struct drm_i915_private *dev_priv) }int -i915_gem_init_hw (struct drm_device *dev) +i915_gem_init_hw (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;enum intel_engine_id id;int ret;
@@ -4382,10 +4381,10 @@ i915_gem_init_hw(struct drm_device *dev) goto out; } -intel_mocs_init_l3cc_table (dev); +intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_setup (dev); + ret =intel_guc_setup (dev_priv);if (ret) goto out;
@@ -4415,12 +4414,11 @@ bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value)return true; } -int i915_gem_init (struct drm_device *dev) +int i915_gem_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex);if (!i915.enable_execlists) { dev_priv->gt.resume = intel_legacy_submission_resume;
@@ -4444,15 +4442,15 @@ int i915_gem_init(struct drm_device *dev)if (ret) goto out_unlock; - ret =i915_gem_context_init (dev); + ret =i915_gem_context_init (dev_priv);if (ret) goto out_unlock; - ret =intel_engines_init (dev); + ret =intel_engines_init (dev_priv);if (ret) goto out_unlock; - ret =i915_gem_init_hw (dev); + ret =i915_gem_init_hw (dev_priv);if (ret == -EIO ) {/* Allow engine initialisation to fail by marking the GPU as * wedged. But we only want to do this where the GPU is angry,
@@ -4465,7 +4463,7 @@ int i915_gem_init(struct drm_device *dev) out_unlock:intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex);return ret; }
drivers/gpu/drm/i915/i915_gem_context.c +14 -17
@@ -167,13 +167,12 @@ void i915_gem_context_free(struct kref *ctx_ref) }static struct drm_i915_gem_object * -alloc_context_obj (struct drm_device *dev,u64 size) +alloc_context_obj (struct drm_i915_private *dev_priv,u64 size) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_gem_object *obj;int ret; -lockdep_assert_held (&dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex); obj =i915_gem_object_create (dev_priv, size);if (IS_ERR (obj))
@@ -260,10 +259,9 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out) }static struct i915_gem_context * -__create_hw_context (struct drm_device *dev, +__create_hw_context (struct drm_i915_private *dev_priv,struct drm_i915_file_private *file_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_gem_context *ctx;int ret;
@@ -287,7 +285,7 @@ __create_hw_context(struct drm_device *dev,struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =alloc_context_obj (dev, dev_priv->hw_context_size); + obj =alloc_context_obj (dev_priv, dev_priv->hw_context_size);if (IS_ERR (obj)) { ret =PTR_ERR (obj); goto err_out;
@@ -353,21 +351,21 @@ __create_hw_context(struct drm_device *dev,* well as an idle case. */ static struct i915_gem_context * -i915_gem_create_context (struct drm_device *dev, +i915_gem_create_context (struct drm_i915_private *dev_priv,struct drm_i915_file_private *file_priv) {struct i915_gem_context *ctx; -lockdep_assert_held (&dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex); - ctx =__create_hw_context (dev, file_priv); + ctx =__create_hw_context (dev_priv, file_priv);if (IS_ERR (ctx))return ctx; -if (USES_FULL_PPGTT (dev)) { +if (USES_FULL_PPGTT (dev_priv)) {struct i915_hw_ppgtt *ppgtt; - ppgtt =i915_ppgtt_create (to_i915 (dev), file_priv, ctx->name); + ppgtt =i915_ppgtt_create (dev_priv, file_priv, ctx->name);if (IS_ERR (ppgtt)) {DRM_DEBUG_DRIVER ("PPGTT setup failed (%ld)\n" ,PTR_ERR (ppgtt));
@@ -407,7 +405,7 @@ i915_gem_context_create_gvt(struct drm_device *dev)if (ret)return ERR_PTR (ret); - ctx =i915_gem_create_context (dev,NULL ); + ctx =i915_gem_create_context (to_i915 (dev),NULL );if (IS_ERR (ctx)) goto out;
@@ -433,9 +431,8 @@ static void i915_gem_context_unpin(struct i915_gem_context *ctx, } } -int i915_gem_context_init (struct drm_device *dev) +int i915_gem_context_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_gem_context *ctx;/* Init should only be called once per module load. Eventually the
@@ -469,7 +466,7 @@ int i915_gem_context_init(struct drm_device *dev) } } - ctx =i915_gem_create_context (dev,NULL ); + ctx =i915_gem_create_context (dev_priv,NULL );if (IS_ERR (ctx)) {DRM_ERROR ("Failed to create default global context (error %ld)\n" ,PTR_ERR (ctx));
@@ -551,7 +548,7 @@ int i915_gem_context_open(struct drm_device *dev, struct drm_file *file)idr_init (&file_priv->context_idr);mutex_lock (&dev->struct_mutex); - ctx =i915_gem_create_context (dev, file_priv); + ctx =i915_gem_create_context (to_i915 (dev), file_priv);mutex_unlock (&dev->struct_mutex);if (IS_ERR (ctx)) {
@@ -1034,7 +1031,7 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,if (ret)return ret; - ctx =i915_gem_create_context (dev, file_priv); + ctx =i915_gem_create_context (to_i915 (dev), file_priv);mutex_unlock (&dev->struct_mutex);if (IS_ERR (ctx))return PTR_ERR (ctx);
drivers/gpu/drm/i915/i915_guc_submission.c +4 -6
@@ -1485,11 +1485,10 @@ void i915_guc_submission_fini(struct drm_i915_private *dev_priv)/** * intel_guc_suspend() - notify GuC entering suspend state -* @dev: drm device +* @dev_priv: i915 device private */ -int intel_guc_suspend (struct drm_device *dev) +int intel_guc_suspend (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_guc *guc = &dev_priv->guc;struct i915_gem_context *ctx;u32 data[3 ];
@@ -1513,11 +1512,10 @@ int intel_guc_suspend(struct drm_device *dev)/** * intel_guc_resume() - notify GuC resuming from suspend state -* @dev: drm device +* @dev_priv: i915 device private */ -int intel_guc_resume (struct drm_device *dev) +int intel_guc_resume (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_guc *guc = &dev_priv->guc;struct i915_gem_context *ctx;u32 data[3 ];
drivers/gpu/drm/i915/intel_engine_cs.c +2 -3
@@ -111,13 +111,12 @@ intel_engine_setup(struct drm_i915_private *dev_priv,/** * intel_engines_init() - allocate, populate and init the Engine Command Streamers -* @dev: DRM device. +* @dev_priv: i915 device private * * Return: non-zero if the initialization failed. */ -int intel_engines_init (struct drm_device *dev) +int intel_engines_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_device_info *device_info =mkwrite_device_info (dev_priv);unsigned int ring_mask =INTEL_INFO (dev_priv)->ring_mask;unsigned int mask =0 ;
drivers/gpu/drm/i915/intel_guc_loader.c +15 -18
@@ -437,7 +437,7 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)/** * intel_guc_setup() - finish preparing the GuC for activity -* @dev: drm device +* @dev_priv: i915 device private * * Called from gem_init_hw() during driver loading and also after a GPU reset. *
@@ -448,9 +448,8 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)* * Return: non-zero code on error */ -int intel_guc_setup (struct drm_device *dev) +int intel_guc_setup (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;const char *fw_path = guc_fw->guc_fw_path;int retries, ret, err;
@@ -588,10 +587,10 @@ int intel_guc_setup(struct drm_device *dev)return ret; } -static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) +static void guc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_guc_fw *guc_fw) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct pci_dev *pdev = dev->pdev; +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_gem_object *obj;const struct firmware *fw =NULL ;struct guc_css_header *css;
@@ -676,9 +675,9 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found, guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex); obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex);if (IS_ERR_OR_NULL (obj)) { err = obj ?PTR_ERR (obj) : -ENOMEM ; goto fail;
@@ -700,12 +699,12 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)DRM_DEBUG_DRIVER ("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n" , err, fw, guc_fw->guc_fw_obj); -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex); obj = guc_fw->guc_fw_obj;if (obj)i915_gem_object_put (obj); guc_fw->guc_fw_obj =NULL ; -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex);release_firmware (fw);/* OK even if fw is NULL */ guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_FAIL ;
@@ -713,16 +712,15 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/** * intel_guc_init() - define parameters and fetch firmware -* @dev: drm device +* @dev_priv: i915 device private * * Called early during driver load, but after GEM is initialised. * * The firmware will be transferred to the GuC's memory later, * when intel_guc_setup() is called. */ -void intel_guc_init (struct drm_device *dev) +void intel_guc_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;const char *fw_path;
@@ -769,7 +767,7 @@ void intel_guc_init(struct drm_device *dev) guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -guc_fw_fetch (dev, guc_fw); +guc_fw_fetch (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }
@@ -777,12 +775,11 @@ void intel_guc_init(struct drm_device *dev)* intel_guc_fini() - clean up all allocated resources * @dev: drm device */ -void intel_guc_fini (struct drm_device *dev) +void intel_guc_fini (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex);guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);i915_guc_submission_fini (dev_priv);
@@ -790,7 +787,7 @@ void intel_guc_fini(struct drm_device *dev)if (guc_fw->guc_fw_obj)i915_gem_object_put (guc_fw->guc_fw_obj); guc_fw->guc_fw_obj =NULL ; -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex); guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; }
drivers/gpu/drm/i915/intel_lrc.h +1 -1
@@ -70,7 +70,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine);int logical_render_ring_init (struct intel_engine_cs *engine);int logical_xcs_ring_init (struct intel_engine_cs *engine); -int intel_engines_init (struct drm_device *dev); +int intel_engines_init (struct drm_i915_private *dev_priv);/* Logical Ring Contexts */
drivers/gpu/drm/i915/intel_mocs.c +2 -3
@@ -380,7 +380,7 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,/** * intel_mocs_init_l3cc_table() - program the mocs control table -* @dev: The the device to be programmed. +* @dev_priv: i915 device private * * This function simply programs the mocs registers for the given table * starting at the given address. This register set is programmed in pairs.
@@ -392,9 +392,8 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,* * Return: Nothing. */ -void intel_mocs_init_l3cc_table (struct drm_device *dev) +void intel_mocs_init_l3cc_table (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_mocs_table table;unsigned int i;
drivers/gpu/drm/i915/intel_mocs.h +1 -1
@@ -53,7 +53,7 @@#include "i915_drv.h" int intel_rcs_context_init_mocs (struct drm_i915_gem_request *req); -void intel_mocs_init_l3cc_table (struct drm_device *dev); +void intel_mocs_init_l3cc_table (struct drm_i915_private *dev_priv);int intel_mocs_init_engine (struct intel_engine_cs *engine);#endif
drivers/gpu/drm/i915/intel_uc.h +5 -5
@@ -178,12 +178,12 @@ int intel_guc_log_flush(struct intel_guc *guc);int intel_guc_log_control (struct intel_guc *guc,u32 control_val);/* intel_guc_loader.c */ -extern void intel_guc_init (struct drm_device *dev); -extern int intel_guc_setup (struct drm_device *dev); -extern void intel_guc_fini (struct drm_device *dev); +extern void intel_guc_init (struct drm_i915_private *dev_priv); +extern int intel_guc_setup (struct drm_i915_private *dev_priv); +extern void intel_guc_fini (struct drm_i915_private *dev_priv);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); -extern int intel_guc_suspend (struct drm_device *dev); -extern int intel_guc_resume (struct drm_device *dev); +extern int intel_guc_suspend (struct drm_i915_private *dev_priv); +extern int intel_guc_resume (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/10] drm/i915: Make various init functions take dev_priv
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Like GEM init, GUC init, MOCS init and context creation.
Enables them to lose
dev_privlocals.Signed-off-by Tvrtko Ursulin <[email protected]>
Keeps pdev \o/
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 4/10 drm/i915: More GEM init dev_priv cleanup
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_gem.c | 10 +++------- drivers/gpu/drm/i915/i915_gem_context.c | 5 ++--- 4 files changed, 13 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -544,8 +544,8 @@ static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {static void i915_gem_fini (struct drm_i915_private *dev_priv) {mutex_lock (&dev_priv->drm.struct_mutex); -i915_gem_cleanup_engines (&dev_priv->drm); -i915_gem_context_fini (&dev_priv->drm); +i915_gem_cleanup_engines (dev_priv); +i915_gem_context_fini (dev_priv);mutex_unlock (&dev_priv->drm.struct_mutex);rcu_barrier ();
@@ -840,7 +840,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_display_hooks (dev_priv);intel_init_clock_gating_hooks (dev_priv);intel_init_audio_hooks (dev_priv); - ret =i915_gem_load_init (&dev_priv->drm); + ret =i915_gem_load_init (dev_priv);if (ret <0 ) goto err_gvt;
@@ -868,7 +868,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) {i915_perf_fini (dev_priv); -i915_gem_load_cleanup (&dev_priv->drm); +i915_gem_load_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv); }
drivers/gpu/drm/i915/i915_drv.h +4 -4
@@ -2970,8 +2970,8 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_wait_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); -int i915_gem_load_init (struct drm_device *dev); -void i915_gem_load_cleanup (struct drm_device *dev); +int i915_gem_load_init (struct drm_i915_private *dev_priv); +void i915_gem_load_cleanup (struct drm_i915_private *dev_priv);void i915_gem_load_init_fences (struct drm_i915_private *dev_priv);int i915_gem_freeze (struct drm_i915_private *dev_priv);int i915_gem_freeze_late (struct drm_i915_private *dev_priv);
@@ -3184,7 +3184,7 @@ void i915_gem_clflush_object(struct drm_i915_gem_object *obj, bool force);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);int __must_check i915_gem_init_hw (struct drm_i915_private *dev_priv);void i915_gem_init_swizzling (struct drm_i915_private *dev_priv); -void i915_gem_cleanup_engines (struct drm_device *dev); +void i915_gem_cleanup_engines (struct drm_i915_private *dev_priv);int __must_check i915_gem_wait_for_idle (struct drm_i915_private *dev_priv,unsigned int flags);int __must_check i915_gem_suspend (struct drm_i915_private *dev_priv);
@@ -3273,7 +3273,7 @@ void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,/* i915_gem_context.c */ int __must_check i915_gem_context_init (struct drm_i915_private *dev_priv);void i915_gem_context_lost (struct drm_i915_private *dev_priv); -void i915_gem_context_fini (struct drm_device *dev); +void i915_gem_context_fini (struct drm_i915_private *dev_priv);int i915_gem_context_open (struct drm_device *dev,struct drm_file *file);void i915_gem_context_close (struct drm_device *dev,struct drm_file *file);int i915_switch_context (struct drm_i915_gem_request *req);
drivers/gpu/drm/i915/i915_gem.c +3 -7
@@ -4469,9 +4469,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv) }void -i915_gem_cleanup_engines (struct drm_device *dev) +i915_gem_cleanup_engines (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;enum intel_engine_id id;
@@ -4511,9 +4510,8 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv) }int -i915_gem_load_init (struct drm_device *dev) +i915_gem_load_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);int err = -ENOMEM ; dev_priv->objects =KMEM_CACHE (drm_i915_gem_object,SLAB_HWCACHE_ALIGN );
@@ -4582,10 +4580,8 @@ i915_gem_load_init(struct drm_device *dev)return err; } -void i915_gem_load_cleanup (struct drm_device *dev) +void i915_gem_load_cleanup (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (!llist_empty (&dev_priv->mm.free_list));mutex_lock (&dev_priv->drm.struct_mutex);
drivers/gpu/drm/i915/i915_gem_context.c +2 -3
@@ -519,12 +519,11 @@ void i915_gem_context_lost(struct drm_i915_private *dev_priv) } } -void i915_gem_context_fini (struct drm_device *dev) +void i915_gem_context_fini (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_gem_context *dctx = dev_priv->kernel_context; -lockdep_assert_held (&dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex);context_close (dctx); dev_priv->kernel_context =NULL ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/10] drm/i915: More GEM init dev_priv cleanup
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 5/10 drm/i915: dev_priv cleanup in bridge/bar/mmio init code
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 52 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +19 -33
@@ -142,9 +142,8 @@ static enum intel_pch intel_virt_detect_pch(struct drm_i915_private *dev_priv)return ret; } -static void intel_detect_pch (struct drm_device *dev) +static void intel_detect_pch (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pch =NULL ;/* In all current cases, num_pipes is equivalent to the PCH_NOP setting
@@ -361,10 +360,8 @@ static int i915_getparam(struct drm_device *dev, void *data,return 0 ; } -static int i915_get_bridge_dev (struct drm_device *dev) +static int i915_get_bridge_dev (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); - dev_priv->bridge_dev =pci_get_bus_and_slot (0 ,PCI_DEVFN (0 ,0 ));if (!dev_priv->bridge_dev) {DRM_ERROR ("bridge device not found\n" );
@@ -375,9 +372,8 @@ static int i915_get_bridge_dev(struct drm_device *dev)/* Allocate space for the MCH regs if needed, return nonzero on error */ static int -intel_alloc_mchbar_resource (struct drm_device *dev) +intel_alloc_mchbar_resource (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);int reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ;u64 mchbar_addr;
@@ -421,9 +417,8 @@ intel_alloc_mchbar_resource(struct drm_device *dev)/* Setup MCHBAR if possible, return true if we should disable it again */ static void -intel_setup_mchbar (struct drm_device *dev) +intel_setup_mchbar (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);int mchbar_reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp;bool enabled;
@@ -445,7 +440,7 @@ intel_setup_mchbar(struct drm_device *dev)if (enabled)return ; -if (intel_alloc_mchbar_resource (dev)) +if (intel_alloc_mchbar_resource (dev_priv))return ; dev_priv->mchbar_need_disable = true;
@@ -461,9 +456,8 @@ intel_setup_mchbar(struct drm_device *dev) }static void -intel_teardown_mchbar (struct drm_device *dev) +intel_teardown_mchbar (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);int mchbar_reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;if (dev_priv->mchbar_need_disable) {
@@ -493,9 +487,9 @@ intel_teardown_mchbar(struct drm_device *dev)/* true = enable decode, false = disable decoder */ static unsigned int i915_vga_set_decode (void *cookie,bool state) { -struct drm_device *dev = cookie; +struct drm_i915_private *dev_priv = cookie; -intel_modeset_vga_set_state (to_i915 (dev), state); +intel_modeset_vga_set_state (dev_priv, state);if (state)return VGA_RSRC_LEGACY_IO |VGA_RSRC_LEGACY_MEM |VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ;
@@ -574,7 +568,7 @@ static int i915_load_modeset_init(struct drm_device *dev)* then we do not take part in VGA arbitration and the * vga_client_register() fails with -ENODEV. */ - ret =vga_client_register (pdev, dev,NULL , i915_vga_set_decode); + ret =vga_client_register (pdev, dev_priv,NULL , i915_vga_set_decode);if (ret && ret != -ENODEV ) goto out;
@@ -830,7 +824,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, goto err_workqueues;/* This must be called before any calls to HAS_PCH_* */ -intel_detect_pch (&dev_priv->drm); +intel_detect_pch (dev_priv);intel_pm_setup (&dev_priv->drm);intel_init_dpio (dev_priv);
@@ -872,10 +866,8 @@ static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv)i915_workqueues_cleanup (dev_priv); } -static int i915_mmio_setup (struct drm_device *dev) +static int i915_mmio_setup (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct pci_dev *pdev = dev_priv->drm.pdev;int mmio_bar;int mmio_size;
@@ -892,7 +884,7 @@ static int i915_mmio_setup(struct drm_device *dev) mmio_size =512 *1024 ; else mmio_size =2 *1024 *1024 ; - dev_priv->regs =pci_iomap (pdev, mmio_bar, mmio_size); + dev_priv->regs =pci_iomap (dev_priv->drm.pdev, mmio_bar, mmio_size);if (dev_priv->regs ==NULL ) {DRM_ERROR ("failed to map registers\n" );
@@ -900,18 +892,15 @@ static int i915_mmio_setup(struct drm_device *dev) }/* Try to make sure MCHBAR is enabled before poking at it */ -intel_setup_mchbar (dev); +intel_setup_mchbar (dev_priv);return 0 ; } -static void i915_mmio_cleanup (struct drm_device *dev) +static void i915_mmio_cleanup (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct pci_dev *pdev = dev_priv->drm.pdev; - -intel_teardown_mchbar (dev); -pci_iounmap (pdev, dev_priv->regs); +intel_teardown_mchbar (dev_priv); +pci_iounmap (dev_priv->drm.pdev, dev_priv->regs); }/**
@@ -925,16 +914,15 @@ static void i915_mmio_cleanup(struct drm_device *dev)*/ static int i915_driver_init_mmio (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;int ret;if (i915_inject_load_failure ())return -ENODEV ; -if (i915_get_bridge_dev (dev)) +if (i915_get_bridge_dev (dev_priv))return -EIO ; - ret =i915_mmio_setup (dev); + ret =i915_mmio_setup (dev_priv);if (ret <0 ) goto put_bridge;
@@ -954,10 +942,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)*/ static void i915_driver_cleanup_mmio (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -intel_uncore_fini (dev_priv); -i915_mmio_cleanup (dev); +i915_mmio_cleanup (dev_priv);pci_dev_put (dev_priv->bridge_dev); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/10] drm/i915: dev_priv cleanup in bridge/bar/mmio init code
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>
<SNIP>
Review
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +1
-1-static int i915_mmio_setup (struct drm_device *dev) +static int i915_mmio_setup (struct drm_i915_private *dev_priv){
(quoted diff) +0
-2- struct drm_i915_private *dev_priv = to_i915(dev); - struct pci_dev *pdev = dev_priv->drm.pdev;
Keep the pdev.
Review
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +1
-1-static void i915_mmio_cleanup (struct drm_device *dev) +static void i915_mmio_cleanup (struct drm_i915_private *dev_priv){
(quoted diff) +0
-2- struct drm_i915_private *dev_priv = to_i915(dev); - struct pci_dev *pdev = dev_priv->drm.pdev;
And here.
Then;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 6/10 drm/i915: Unexport VGA switcheroo functions
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
They are only used in i915_drv.c so a forward declaration is enough.
--- drivers/gpu/drm/i915/i915_drv.c | 5 ++++- drivers/gpu/drm/i915/i915_drv.h | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -1
@@ -497,6 +497,9 @@ static unsigned int i915_vga_set_decode(void *cookie, bool state)return VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ; } +static int i915_resume_switcheroo (struct drm_device *dev); +static int i915_suspend_switcheroo (struct drm_device *dev,pm_message_t state); +static void i915_switcheroo_set_state (struct pci_dev *pdev,enum vga_switcheroo_state state) {struct drm_device *dev =pci_get_drvdata (pdev);
@@ -1711,7 +1714,7 @@ static int i915_drm_resume_early(struct drm_device *dev)return ret; } -int i915_resume_switcheroo (struct drm_device *dev) +static int i915_resume_switcheroo (struct drm_device *dev) {int ret;
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -2754,9 +2754,6 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)return false; } -extern int i915_suspend_switcheroo (struct drm_device *dev,pm_message_t state); -extern int i915_resume_switcheroo (struct drm_device *dev); -int intel_sanitize_enable_ppgtt (struct drm_i915_private *dev_priv,int enable_ppgtt);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/10] drm/i915: Unexport VGA switcheroo functions
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
They are only used in
i915_drv.cso a forward declaration is enough.Signed-off-by Tvrtko Ursulin <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 7/10 drm/i915: Make gmbus setup take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 8 +++----- 4 files changed, 8 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -592,7 +592,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_csr; -intel_setup_gmbus (dev); +intel_setup_gmbus (dev_priv);/* Important: The output setup functions called by modeset_init need * working irqs for e.g. gmbus and dp aux transfers. */
@@ -629,7 +629,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_irq:intel_guc_fini (dev_priv);drm_irq_uninstall (dev); -intel_teardown_gmbus (dev); +intel_teardown_gmbus (dev_priv); cleanup_csr:intel_csr_ucode_fini (dev_priv);intel_power_domains_fini (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -3482,8 +3482,8 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv);void i915_teardown_sysfs (struct drm_i915_private *dev_priv);/* intel_i2c.c */ -extern int intel_setup_gmbus (struct drm_device *dev); -extern void intel_teardown_gmbus (struct drm_device *dev); +extern int intel_setup_gmbus (struct drm_i915_private *dev_priv); +extern void intel_teardown_gmbus (struct drm_i915_private *dev_priv);extern bool intel_gmbus_is_valid_pin (struct drm_i915_private *dev_priv,unsigned int pin);
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -17162,7 +17162,7 @@ void intel_modeset_cleanup(struct drm_device *dev)intel_cleanup_gt_powersave (dev_priv); -intel_teardown_gmbus (dev); +intel_teardown_gmbus (dev_priv); } void intel_connector_attach_encoder(struct intel_connector *connector,
drivers/gpu/drm/i915/intel_i2c.c +3 -5
@@ -617,11 +617,10 @@ static const struct i2c_algorithm gmbus_algorithm = {/** * intel_gmbus_setup - instantiate all Intel i2c GMBuses -* @dev: DRM device +* @dev_priv: i915 device private */ -int intel_setup_gmbus (struct drm_device *dev) +int intel_setup_gmbus (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev = dev_priv->drm.pdev;struct intel_gmbus *bus;unsigned int pin;
@@ -724,9 +723,8 @@ void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)mutex_unlock (&dev_priv->gmbus_mutex); } -void intel_teardown_gmbus (struct drm_device *dev) +void intel_teardown_gmbus (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_gmbus *bus;unsigned int pin;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/10] drm/i915: Make gmbus setup take dev_priv
Quoted 2 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Commit message.
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
With that,
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 8/10 drm/i915: Make i915_destroy_error_state take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Since it does not need dev at all.
Also change the stored pointer in struct i915_error_state_file_priv to i915.
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/i915_gpu_error.c | 5 ++--- drivers/gpu/drm/i915/i915_sysfs.c | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -946,7 +946,7 @@ i915_error_state_write(struct file *filp,struct i915_error_state_file_priv *error_priv = filp->private_data;DRM_DEBUG_DRIVER ("Resetting error state\n" ); -i915_destroy_error_state (error_priv->dev); +i915_destroy_error_state (error_priv->i915);return cnt; }
@@ -960,7 +960,7 @@ static int i915_error_state_open(struct inode *inode, struct file *file)if (!error_priv)return -ENOMEM ; - error_priv->dev = &dev_priv->drm; + error_priv->i915 = dev_priv;i915_error_state_get (&dev_priv->drm, error_priv);
@@ -988,8 +988,8 @@ static ssize_t i915_error_state_read(struct file *file, char __user *userbuf,ssize_t ret_count =0 ;int ret; - ret =i915_error_state_buf_init (&error_str, -to_i915 (error_priv->dev), count, *pos); + ret =i915_error_state_buf_init (&error_str, error_priv->i915, + count, *pos);if (ret)return ret;
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1311,7 +1311,7 @@ void i915_driver_unload(struct drm_device *dev)/* Free error state after interrupts are fully disabled. */ cancel_delayed_work_sync (&dev_priv->gpu_error.hangcheck_work); -i915_destroy_error_state (dev); +i915_destroy_error_state (dev_priv);/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq);
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -1457,7 +1457,7 @@ struct drm_i915_error_state_buf { };struct i915_error_state_file_priv { -struct drm_device *dev; +struct drm_i915_private *i915;struct drm_i915_error_state *error; };
@@ -3438,7 +3438,7 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,void i915_error_state_get (struct drm_device *dev,struct i915_error_state_file_priv *error_priv);void i915_error_state_put (struct i915_error_state_file_priv *error_priv); -void i915_destroy_error_state (struct drm_device *dev); +void i915_destroy_error_state (struct drm_i915_private *dev_priv);#else
@@ -3448,7 +3448,7 @@ static inline void i915_capture_error_state(struct drm_i915_private *dev_priv, { } -static inline void i915_destroy_error_state (struct drm_device *dev) +static inline void i915_destroy_error_state (struct drm_i915_private *dev_priv) { }
drivers/gpu/drm/i915/i915_gpu_error.c +2 -3
@@ -514,7 +514,7 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,int i915_error_state_to_str (struct drm_i915_error_state_buf *m,const struct i915_error_state_file_priv *error_priv) { -struct drm_i915_private *dev_priv =to_i915 (error_priv->dev); +struct drm_i915_private *dev_priv = error_priv->i915;struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj;
@@ -1644,9 +1644,8 @@ void i915_error_state_put(struct i915_error_state_file_priv *error_priv)kref_put (&error_priv->error->ref, i915_error_state_free); } -void i915_destroy_error_state (struct drm_device *dev) +void i915_destroy_error_state (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_error_state *error;spin_lock_irq (&dev_priv->gpu_error.lock);
drivers/gpu/drm/i915/i915_sysfs.c +2 -2
@@ -535,7 +535,7 @@ static ssize_t error_state_read(struct file *filp, struct kobject *kobj,if (ret)return ret; - error_priv.dev = dev; + error_priv.i915 = dev_priv;i915_error_state_get (dev, &error_priv); ret =i915_error_state_to_str (&error_str, &error_priv);
@@ -560,7 +560,7 @@ static ssize_t error_state_write(struct file *file, struct kobject *kobj,struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev);DRM_DEBUG_DRIVER ("Resetting error state\n" ); -i915_destroy_error_state (&dev_priv->drm); +i915_destroy_error_state (dev_priv);return count; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: Make i915_destroy_error_state take dev_priv
Quoted 8 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Since it does not need dev at all.
Also change the stored pointer in struct
i915_error_state_file_privto i915.Signed-off-by Tvrtko Ursulin <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 9/10 drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/i915_suspend.c | 22 +++++++++------------- drivers/gpu/drm/i915/intel_i2c.c | 8 +++----- 4 files changed, 17 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1443,7 +1443,7 @@ static int i915_drm_suspend(struct drm_device *dev)i915_gem_suspend_gtt_mappings (dev_priv); -i915_save_state (dev); +i915_save_state (dev_priv); opregion_target_state =suspend_to_idle (dev_priv) ?PCI_D1 : PCI_D3cold;intel_opregion_notify_adapter (dev_priv, opregion_target_state);
@@ -1566,7 +1566,7 @@ static int i915_drm_resume(struct drm_device *dev)i915_gem_resume (dev_priv); -i915_restore_state (dev); +i915_restore_state (dev_priv);intel_pps_unlock_regs_wa (dev_priv);intel_opregion_setup (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -3474,8 +3474,8 @@ extern void i915_perf_register(struct drm_i915_private *dev_priv);extern void i915_perf_unregister (struct drm_i915_private *dev_priv);/* i915_suspend.c */ -extern int i915_save_state (struct drm_device *dev); -extern int i915_restore_state (struct drm_device *dev); +extern int i915_save_state (struct drm_i915_private *dev_priv); +extern int i915_restore_state (struct drm_i915_private *dev_priv);/* i915_sysfs.c */ void i915_setup_sysfs (struct drm_i915_private *dev_priv);
@@ -3495,7 +3495,7 @@ static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -extern void intel_i2c_reset (struct drm_device *dev); +extern void intel_i2c_reset (struct drm_i915_private *dev_priv);/* intel_bios.c */ int intel_bios_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_suspend.c +9 -13
@@ -56,18 +56,16 @@ static void i915_restore_display(struct drm_i915_private *dev_priv)i915_redisable_vga (dev_priv); } -int i915_save_state (struct drm_device *dev) +int i915_save_state (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct pci_dev *pdev = dev_priv->drm.pdev;int i; -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex);i915_save_display (dev_priv);if (IS_GEN4 (dev_priv)) -pci_read_config_word (pdev,GCDGMBUS , +pci_read_config_word (dev_priv->drm.pdev,GCDGMBUS , &dev_priv->regfile.saveGCDGMBUS);/* Cache mode state */
@@ -97,23 +95,21 @@ int i915_save_state(struct drm_device *dev) dev_priv->regfile.saveSWF3[i] =I915_READ (SWF3 (i)); } -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex);return 0 ; } -int i915_restore_state (struct drm_device *dev) +int i915_restore_state (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -struct pci_dev *pdev = dev_priv->drm.pdev;int i; -mutex_lock (&dev->struct_mutex); +mutex_lock (&dev_priv->drm.struct_mutex);i915_gem_restore_fences (dev_priv);if (IS_GEN4 (dev_priv)) -pci_write_config_word (pdev,GCDGMBUS , +pci_write_config_word (dev_priv->drm.pdev,GCDGMBUS , dev_priv->regfile.saveGCDGMBUS);i915_restore_display (dev_priv);
@@ -145,9 +141,9 @@ int i915_restore_state(struct drm_device *dev)I915_WRITE (SWF3 (i), dev_priv->regfile.saveSWF3[i]); } -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&dev_priv->drm.struct_mutex); -intel_i2c_reset (dev); +intel_i2c_reset (dev_priv);return 0 ; }
drivers/gpu/drm/i915/intel_i2c.c +3 -5
@@ -111,10 +111,8 @@ to_intel_gmbus(struct i2c_adapter *i2c) }void -intel_i2c_reset (struct drm_device *dev) +intel_i2c_reset (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -I915_WRITE (GMBUS0 ,0 );I915_WRITE (GMBUS4 ,0 ); }
@@ -211,7 +209,7 @@ intel_gpio_pre_xfer(struct i2c_adapter *adapter) adapter);struct drm_i915_private *dev_priv = bus->dev_priv; -intel_i2c_reset (&dev_priv->drm); +intel_i2c_reset (dev_priv);intel_i2c_quirk_set (dev_priv, true);set_data (bus,1 );set_clock (bus,1 );
@@ -677,7 +675,7 @@ int intel_setup_gmbus(struct drm_i915_private *dev_priv) goto err; } -intel_i2c_reset (&dev_priv->drm); +intel_i2c_reset (dev_priv);return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/10] drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv
Quoted 2 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Empty commit message is strictly forbidden. At least repeat the title with a couple more word.
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
Again, keep the 'pdev' and this is;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 10/10 drm/i915: Make intel_pm_setup take dev_priv
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -829,7 +829,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,/* This must be called before any calls to HAS_PCH_* */ intel_detect_pch (dev_priv); -intel_pm_setup (&dev_priv->drm); +intel_pm_setup (dev_priv);intel_init_dpio (dev_priv);intel_power_domains_init (dev_priv);intel_irq_init (dev_priv);
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1724,7 +1724,7 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv);void intel_update_watermarks (struct intel_crtc *crtc);void intel_init_pm (struct drm_i915_private *dev_priv);void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv); -void intel_pm_setup (struct drm_device *dev); +void intel_pm_setup (struct drm_i915_private *dev_priv);void intel_gpu_ips_init (struct drm_i915_private *dev_priv);void intel_gpu_ips_teardown (void );void intel_init_gt_powersave (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +1 -3
@@ -7955,10 +7955,8 @@ void intel_queue_rps_boost_for_request(struct drm_i915_gem_request *req)queue_work (req->i915->wq, &boost->work); } -void intel_pm_setup (struct drm_device *dev) +void intel_pm_setup (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -mutex_init (&dev_priv->rps.hw_lock);spin_lock_init (&dev_priv->rps.client_lock);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: Make intel_pm_setup take dev_priv
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>
With commit message;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Autumn of churn continues. :)
This series tidies GEM object construction to take
dev_privinstead of dev in all cases and also does a bit of random tidy in the driver load/init code.Basically functions which only need
dev_privare changed to takedev_privinstead of dev. There is often a cascade effect and the end result is a saving in lines of code. And even in binary occasionally but not worth much mention.
Quoted 12 lines
Tvrtko Ursulin (10):
drm/i915: Make GEM object alloc/free and stolen created takedev_privdrm/i915: Make GEM object create and create from data takedev_privdrm/i915: Make various init functions takedev_privdrm/i915: More GEM initdev_privcleanup
drm/i915:dev_privcleanup in bridge/bar/mmio init code drm/i915: Unexport VGA switcheroo functions
drm/i915: Make gmbus setup takedev_priv
drm/i915: Makei915_destroy_error_statetakedev_privdrm/i915: Make i915_save/restore_state andintel_i2c_resettake
dev_priv
drm/i915: Makeintel_pm_setuptakedev_priv
They all look ok and many are a sight for sore eyes.
Quoted 1 line
28 files changed, 214 insertions(+), 261 deletions(-)
Just from superlus locals and declarations, nice!
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for GEM object create and driver init dev_priv cleanups
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: GEM object create and driver init dev_priv cleanups
URL : https://patchwork.freedesktop.org/series/16162/
State : failure
== Summary ==
CC [M] drivers/gpu/drm/i915/gvt/sched_policy.o
CC [M] drivers/gpu/drm/i915/gvt/render.o
CC [M] drivers/gpu/drm/i915/gvt/cmd_parser.o
LD drivers/base/regmap/built-in.o
LD drivers/scsi/scsi_mod.o
LD drivers/video/fbdev/core/fb.o
LD [M] sound/pci/hda/snd-hda-codec-generic.o
LD drivers/video/fbdev/core/built-in.o
LD sound/pci/built-in.o
LD drivers/iommu/built-in.o
LD [M] drivers/net/ethernet/broadcom/genet/genet.o
LD lib/raid6/raid6_pq.o
LD drivers/acpi/acpica/acpi.o
LD drivers/base/power/built-in.o
LD lib/raid6/built-in.o
LD drivers/usb/storage/usb-storage.o
LD drivers/usb/gadget/libcomposite.o
LD drivers/usb/storage/built-in.o
LD drivers/base/built-in.o
LD sound/built-in.o
LD drivers/video/fbdev/built-in.o
LD drivers/pci/built-in.o
LD [M] drivers/misc/mei/mei-me.o
LD drivers/acpi/acpica/built-in.o
LD drivers/misc/built-in.o
LD drivers/tty/serial/8250/8250_base.o
LD drivers/spi/built-in.o
LD drivers/tty/serial/8250/built-in.o
LD drivers/tty/serial/built-in.o
LD drivers/thermal/thermal_sys.o
LD [M] drivers/usb/serial/usbserial.o
LD drivers/acpi/built-in.o
LD drivers/thermal/built-in.o
LD drivers/usb/gadget/udc/udc-core.o
LD drivers/usb/gadget/udc/built-in.o
LD drivers/usb/gadget/built-in.o
LD drivers/video/console/built-in.o
LD drivers/video/built-in.o
LD net/ipv6/ipv6.o
LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o
LD net/ipv6/built-in.o
drivers/gpu/drm/i915/gvt/cmd_parser.c: In function ‘perform_bb_shadow’:
drivers/gpu/drm/i915/gvt/cmd_parser.c:1605:26: error: passing argument 1 of ‘i915_gem_object_create’ from incompatible pointer type [-Werror=incompatible-pointer-types]
i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm),
^In file included from drivers/gpu/drm/i915/gvt/cmd_parser.c:38:0:drivers/gpu/drm/i915/i915_drv.h:2990:1: note: expected ‘struct drm_i915_private *’ but argument is of type ‘struct drm_device *’
i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size);
^drivers/gpu/drm/i915/gvt/cmd_parser.c: In function ‘shadow_indirect_ctx’:drivers/gpu/drm/i915/gvt/cmd_parser.c:2675:31: error: passing argument 1 of ‘i915_gem_object_create’ from incompatible pointer type [-Werror=incompatible-pointer-types]
obj = i915_gem_object_create(dev,
^
In file included from drivers/gpu/drm/i915/gvt/cmd_parser.c:38:0:drivers/gpu/drm/i915/i915_drv.h:2990:1: note: expected ‘struct drm_i915_private *’ but argument is of type ‘struct drm_device *’
i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size);
^
LD [M] drivers/net/ethernet/intel/e1000/e1000.o LD drivers/tty/vt/built-in.o LD drivers/tty/built-in.o LD drivers/scsi/sd_mod.o LD drivers/scsi/built-in.o LD fs/btrfs/btrfs.o LD fs/btrfs/built-in.o LD drivers/usb/core/usbcore.o LD drivers/usb/core/built-in.o LD drivers/usb/host/xhci-hcd.o AR lib/lib.a
EXPORTS lib/lib-ksyms.o
LD net/ipv4/built-in.o
LD lib/built-in.o
cc1: all warnings being treated as errors
CC arch/x86/kernel/cpu/capflags.oscripts/Makefile.build:293: recipe for target 'drivers/gpu/drm/i915/gvt/cmd_parser.o' failed make[4]: *** [drivers/gpu/drm/i915/gvt/cmd_parser.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD arch/x86/kernel/cpu/built-in.o LD arch/x86/kernel/built-in.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD arch/x86/built-in.o LD drivers/md/md-mod.o LD drivers/md/built-in.o LD drivers/usb/host/built-in.o LD drivers/usb/built-in.o LD fs/ext4/ext4.o LD fs/ext4/built-in.o LD fs/built-in.o LD net/core/built-in.o LD net/built-in.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD drivers/net/ethernet/built-in.o LD drivers/net/built-in.o
scripts/Makefile.build:544: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:544: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:544: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:986: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx