drm/i915: less magic for stolen preallocated objects w/o gtt offset
Subsystems (2)
PATCH 1/1 drm/i915: less magic for stolen preallocated objects w/o gtt offset
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has been added in
commit 3727d55e4d85836aa6cb759a965daaef88074150
Author: Jesse Barnes <[email protected]> Date: Wed May 8 10:45:14 2013 -0700
drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's drm_mm_create_block changes.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1197,6 +1197,7 @@ enum hdmi_force_audio { };#define I915_GTT_RESERVED ((struct drm_mm_node *)0x1) +#define I915_GTT_OFFSET_NONE (0xffffffffUL)struct drm_i915_gem_object_ops {/* Interface between the GEM object and its backing storage.
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -360,7 +360,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, }/* Some objects just need physical mem from stolen space */ -if (gtt_offset ==-1 ) +if (gtt_offset ==I915_GTT_OFFSET_NONE )return obj;/* To simplify the initialisation sequence between KMS and GTT,
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -3481,7 +3481,7 @@ static void valleyview_setup_pctx(struct drm_device *dev) pcbr_offset = (pcbr & (~4095 )) - dev_priv->mm.stolen_base; pctx =i915_gem_object_create_stolen_for_preallocated (dev_priv->dev, pcbr_offset, --1 , +I915_GTT_OFFSET_NONE , pctx_size); goto out; }
Signature · 1 line
1.7.11.7
Quoted 4 lines · Daniel Vetter
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has been added in
Quoted 8 lines
commit
3727d55e4d85836aa6cb759a965daaef88074150Author: Jesse Barnes <[email protected]> Date: Wed May 8 10:45:14 2013 -0700drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's
drm_mm_create_blockchanges.
A 32bit number in a 32/64bit constant. So still a type mismatch in the comparisons, just use ((u32)-1).
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 drm/i915: less magic for stolen preallocated objects w/o gtt offset
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has been added in
commit 3727d55e4d85836aa6cb759a965daaef88074150
Author: Jesse Barnes <[email protected]> Date: Wed May 8 10:45:14 2013 -0700
drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's drm_mm_create_block changes.
v2: Cast the constant to u32 since otherwise we again have a type mismatch. Suggested by Chris Wilson.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1197,6 +1197,7 @@ enum hdmi_force_audio { };#define I915_GTT_RESERVED ((struct drm_mm_node *)0x1) +#define I915_GTT_OFFSET_NONE ((u32)-1)struct drm_i915_gem_object_ops {/* Interface between the GEM object and its backing storage.
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -360,7 +360,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, }/* Some objects just need physical mem from stolen space */ -if (gtt_offset ==-1 ) +if (gtt_offset ==I915_GTT_OFFSET_NONE )return obj;/* To simplify the initialisation sequence between KMS and GTT,
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -3481,7 +3481,7 @@ static void valleyview_setup_pctx(struct drm_device *dev) pcbr_offset = (pcbr & (~4095 )) - dev_priv->mm.stolen_base; pctx =i915_gem_object_create_stolen_for_preallocated (dev_priv->dev, pcbr_offset, --1 , +I915_GTT_OFFSET_NONE , pctx_size); goto out; }
Signature · 1 line
1.7.11.7
Quoted 2 lines · Daniel Vetter
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has
s/depens/depends/.
Quoted 11 lines
been added in
commit
3727d55e4d85836aa6cb759a965daaef88074150Author: Jesse Barnes <[email protected]> Date: Wed May 8 10:45:14 2013 -0700drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's
drm_mm_create_blockchanges.
Quoted 6 lines
v2: Cast the constant to u32 since otherwise we again have a type mismatch. Suggested by Chris Wilson.
Cc Ben Widawsky <[email protected]>Cc Jesse Barnes <[email protected]>Signed-off-by Daniel Vetter <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 5 lines · Chris Wilson
Quoted 2 lines · Daniel Vetter
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has
s/depens/depends/.
Fixed ...
Quoted 12 lines
Quoted 12 lines
been added in
commit
3727d55e4d85836aa6cb759a965daaef88074150Author: Jesse Barnes <[email protected]> Date: Wed May 8 10:45:14 2013 -0700drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's
drm_mm_create_blockchanges.
Quoted 7 lines
Quoted 6 lines
v2: Cast the constant to u32 since otherwise we again have a type mismatch. Suggested by Chris Wilson.
Cc Ben Widawsky <[email protected]>Cc Jesse Barnes <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Reviewed-by Chris Wilson <[email protected]>
... and merged, thanks for the review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 1/1 drm/i915: don't frob mm.suspended when not using ums
In reply to Chris WilsonIn kernel modeset driver mode we're in full control of the chip, always. So there's no need at all to set mm.suspended in i915_gem_idle. Hence move that out into the leavevt ioctl. Since i915_gem_idle doesn't suspend gem any more we can also drop the re-enabling for KMS in the thaw function.
Also clean up the handling of mm.suspend at driver load by coalescing all the assignments.
Stumbled over while reading through our resume code for unrelated reasons.
v2: Shovel mm.suspended into the (newly created) ums dungeon as suggested by Chris Wilson. The plan is that once we've completely stopped relying on the register save/restore code we could shovel even that in there.
v3: Improve the locking for the entervt/leavevt ioctls a bit by moving the dev->struct_mutex locking outside of i915_gem_idle. Also don't clear dev_priv->ums.mm_suspended for the kms case, we allocate it with kzalloc. Both suggested by Chris Wilson.
--- drivers/gpu/drm/i915/i915_dma.c | 13 +++------- drivers/gpu/drm/i915/i915_drv.c | 11 +++++--- drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++-------- drivers/gpu/drm/i915/i915_gem.c | 40 ++++++++++++++++++------------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 5 files changed, 50 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +4 -9
@@ -1323,10 +1323,8 @@ static int i915_load_modeset_init(struct drm_device *dev)/* Always safe in the mode setting case. */ /* FIXME: do pre/post-mode set stuff in core KMS code */ dev->vblank_disable_allowed =1 ; -if (INTEL_INFO (dev)->num_pipes ==0 ) { - dev_priv->mm.suspended =0 ; +if (INTEL_INFO (dev)->num_pipes ==0 )return 0 ; - } ret =intel_fbdev_init (dev);if (ret)
@@ -1352,9 +1350,6 @@ static int i915_load_modeset_init(struct drm_device *dev)drm_kms_helper_poll_init (dev); -/* We're off and running w/KMS */ - dev_priv->mm.suspended =0 ; -return 0 ; cleanup_gem:
@@ -1629,9 +1624,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto out_gem_unload; } -/* Start out suspended */ - dev_priv->mm.suspended =1 ; -if (HAS_POWER_WELL (dev))i915_init_power_well (dev);
@@ -1641,6 +1633,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)DRM_ERROR ("failed to init modeset\n" ); goto out_gem_unload; } + }else { +/* Start out suspended in ums mode. */ + dev_priv->ums.mm_suspended =1 ; }i915_setup_sysfs (dev);
drivers/gpu/drm/i915/i915_drv.c +7 -4
@@ -556,7 +556,11 @@ static int i915_drm_freeze(struct drm_device *dev)/* If KMS is active, we do the leavevt stuff here */ if (drm_core_check_feature (dev,DRIVER_MODESET )) { -int error =i915_gem_idle (dev); +int error; + +mutex_lock (&dev->struct_mutex); + error =i915_gem_idle (dev); +mutex_unlock (&dev->struct_mutex);if (error) {dev_err (&dev->pdev->dev,"GEM idle failed, resume might fail\n" );
@@ -661,7 +665,6 @@ static int __i915_drm_thaw(struct drm_device *dev)intel_init_pch_refclk (dev);mutex_lock (&dev->struct_mutex); - dev_priv->mm.suspended =0 ; error =i915_gem_init_hw (dev);mutex_unlock (&dev->struct_mutex);
@@ -960,11 +963,11 @@ int i915_reset(struct drm_device *dev)* switched away). */ if (drm_core_check_feature (dev,DRIVER_MODESET ) || - !dev_priv->mm.suspended) { + !dev_priv->ums.mm_suspended) {struct intel_ring_buffer *ring;int i; - dev_priv->mm.suspended =0 ; + dev_priv->ums.mm_suspended =0 ;i915_gem_init_swizzling (dev);
drivers/gpu/drm/i915/i915_drv.h +14 -10
@@ -814,6 +814,18 @@ struct i915_dri1_state {uint32_t counter; }; +struct i915_ums_state { +/** +* Flag if the X Server, and thus DRM, is not currently in +* control of the device. +* +* This is set between LeaveVT and EnterVT. It needs to be +* replaced with a semaphore. It also needs to be +* transitioned away from for kernel modesetting. +*/ +int mm_suspended; +}; +struct intel_l3_parity {u32 *remap_info;struct work_struct error_work;
@@ -884,16 +896,6 @@ struct i915_gem_mm {*/ bool interruptible; -/** -* Flag if the X Server, and thus DRM, is not currently in -* control of the device. -* -* This is set between LeaveVT and EnterVT. It needs to be -* replaced with a semaphore. It also needs to be -* transitioned away from for kernel modesetting. -*/ -int suspended; -/** Bit 6 swizzling required for X tiling */ uint32_t bit_6_swizzle_x;/** Bit 6 swizzling required for Y tiling */
@@ -1187,6 +1189,8 @@ typedef struct drm_i915_private {/* Old dri1 support infrastructure, beware the dragons ya fools entering * here! */ struct i915_dri1_state dri1; +/* Old ums support infrastructure, same warning applies. */ +struct i915_ums_state ums; } drm_i915_private_t;/* Iterate over initialised rings */
drivers/gpu/drm/i915/i915_gem.c +24 -16
@@ -2082,7 +2082,7 @@ int __i915_add_request(struct intel_ring_buffer *ring,trace_i915_gem_request_add (ring, request->seqno); ring->outstanding_lazy_request =0 ; -if (!dev_priv->mm.suspended) { +if (!dev_priv->ums.mm_suspended) {if (i915_enable_hangcheck) {mod_timer (&dev_priv->gpu_error.hangcheck_timer,round_jiffies_up (jiffies +DRM_I915_HANGCHECK_JIFFIES ));
@@ -2387,7 +2387,7 @@ i915_gem_retire_work_handler(struct work_struct *work) idle &=list_empty (&ring->request_list); } -if (!dev_priv->mm.suspended && !idle) +if (!dev_priv->ums.mm_suspended && !idle)queue_delayed_work (dev_priv->wq, &dev_priv->mm.retire_work,round_jiffies_up_relative (HZ ));if (idle)
@@ -3981,9 +3981,7 @@ i915_gem_idle(struct drm_device *dev)drm_i915_private_t *dev_priv = dev->dev_private;int ret; -mutex_lock (&dev->struct_mutex); - -if (dev_priv->mm.suspended) { +if (dev_priv->ums.mm_suspended) {mutex_unlock (&dev->struct_mutex);return 0 ; }
@@ -3999,18 +3997,11 @@ i915_gem_idle(struct drm_device *dev)if (!drm_core_check_feature (dev,DRIVER_MODESET ))i915_gem_evict_everything (dev); -/* Hack! Don't let anybody do execbuf while we don't control the chip. -* We need to replace this with a semaphore, or something. -* And not confound mm.suspended! -*/ - dev_priv->mm.suspended =1 ;del_timer_sync (&dev_priv->gpu_error.hangcheck_timer);i915_kernel_lost_context (dev);i915_gem_cleanup_ringbuffer (dev); -mutex_unlock (&dev->struct_mutex); -/* Cancel the retire work handler, which should be idle now. */ cancel_delayed_work_sync (&dev_priv->mm.retire_work);
@@ -4220,7 +4211,7 @@ int i915_gem_entervt_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = dev->dev_private;int ret;if (drm_core_check_feature (dev,DRIVER_MODESET ))
@@ -4232,7 +4223,7 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, }mutex_lock (&dev->struct_mutex); - dev_priv->mm.suspended =0 ; + dev_priv->ums.mm_suspended =0 ; ret =i915_gem_init_hw (dev);if (ret !=0 ) {
@@ -4252,7 +4243,7 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, cleanup_ringbuffer:mutex_lock (&dev->struct_mutex);i915_gem_cleanup_ringbuffer (dev); - dev_priv->mm.suspended =1 ; + dev_priv->ums.mm_suspended =1 ;mutex_unlock (&dev->struct_mutex);return ret;
@@ -4262,11 +4253,26 @@ int i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { + struct drm_i915_private *dev_priv = dev->dev_private; +int ret; +if (drm_core_check_feature (dev,DRIVER_MODESET ))return 0 ;drm_irq_uninstall (dev); - return i915_gem_idle(dev); + +mutex_lock (&dev->struct_mutex); + ret =i915_gem_idle (dev); + +/* Hack! Don't let anybody do execbuf while we don't control the chip. +* We need to replace this with a semaphore, or something. +* And not confound ums.mm_suspended! +*/ +if (ret !=0 ) + dev_priv->ums.mm_suspended =1 ; +mutex_unlock (&dev->struct_mutex); + +return ret; }void
@@ -4277,9 +4283,11 @@ i915_gem_lastclose(struct drm_device *dev)if (drm_core_check_feature (dev,DRIVER_MODESET ))return ; +mutex_lock (&dev->struct_mutex); ret =i915_gem_idle (dev);if (ret)DRM_ERROR ("failed to idle hardware: %d\n" , ret); +mutex_unlock (&dev->struct_mutex); } static void
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -973,7 +973,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,if (ret) goto pre_mutex_err; -if (dev_priv->mm.suspended) { +if (dev_priv->ums.mm_suspended) {mutex_unlock (&dev->struct_mutex); ret = -EBUSY ; goto pre_mutex_err;
Signature · 1 line
1.7.11.7