beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

i915 renames for ipts

Browse source
This commit is contained in:
Jake Day 2017-08-10 13:54:52 -04:00
parent bb5ba49137
commit 716c361ce2
7 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_drv.c
View file

@ -628,7 +628,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
drm_kms_helper_poll_init(dev);
pr_info(">> let init ipts\n");
if (INTEL_GEN(dev) >= 9 && i915.enable_guc_submission)
if (INTEL_GEN(dev_priv) >= 9 && i915.enable_guc_submission)
intel_ipts_init(dev);
return 0;
@ -1321,7 +1321,7 @@ void i915_driver_unload(struct drm_device *dev)
struct drm_i915_private *dev_priv = to_i915(dev);
struct pci_dev *pdev = dev_priv->drm.pdev;
if (INTEL_GEN(dev) >= 9 && i915.enable_guc_submission)
if (INTEL_GEN(dev_priv) >= 9 && i915.enable_guc_submission)
intel_ipts_cleanup(dev);
intel_fbdev_fini(dev);

2
drivers/gpu/drm/i915/i915_drv.h
View file

@ -3501,7 +3501,7 @@ void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
struct sg_table *pages);
struct i915_gem_context *
i915_gem_context_create_ipts(struct drm_i915_private *dev_priv);
i915_gem_context_create_ipts(struct drm_device *dev);
static inline struct i915_gem_context *
i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id)

3
drivers/gpu/drm/i915/i915_gem_context.c
View file

@ -422,8 +422,9 @@ out:
return ctx;
}
struct i915_gem_context *i915_gem_context_create_ipts(struct drm_i915_private *dev_priv)
struct i915_gem_context *i915_gem_context_create_ipts(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct i915_gem_context *ctx;
BUG_ON(!mutex_is_locked(&dev->struct_mutex));

4
drivers/gpu/drm/i915/i915_guc_submission.c
View file

@ -1350,7 +1350,7 @@ int i915_guc_ipts_submission_enable(struct drm_i915_private *dev_priv,
}
guc->ipts_client = client;
host2guc_sample_forcewake(guc, client);
intel_guc_sample_forcewake(guc);
guc_init_doorbell_hw(guc);
return 0;
@ -1371,6 +1371,6 @@ void i915_guc_ipts_reacquire_doorbell(struct drm_i915_private *dev_priv)
{
struct intel_guc *guc = &dev_priv->guc;
if (host2guc_allocate_doorbell(guc, guc->ipts_client))
if (guc_allocate_doorbell(guc, guc->ipts_client))
DRM_ERROR("Not able to reacquire IPTS doorbell\n");
}

14
drivers/gpu/drm/i915/intel_ipts.c
View file

@ -69,6 +69,7 @@ typedef struct intel_ipts_object {
static intel_ipts_object_t *ipts_object_create(size_t size, u32 flags)
{
struct drm_i915_private *dev_priv = intel_ipts.dev->dev_private;
intel_ipts_object_t *obj = NULL;
struct drm_i915_gem_object *gem_obj = NULL;
int ret = 0;
@ -84,7 +85,7 @@ static intel_ipts_object_t *ipts_object_create(size_t size, u32 flags)
}
/* Allocate the new object */
gem_obj = i915_gem_object_create(intel_ipts.dev, size);
gem_obj = i915_gem_object_create(dev_priv, size);
if (gem_obj == NULL) {
ret = -ENOMEM;
goto err_out;
@ -140,7 +141,7 @@ static int ipts_object_pin(intel_ipts_object_t* obj,
vm = &dev_priv->ggtt.base;
}
vma = i915_gem_obj_lookup_or_create_vma(obj->gem_obj, vm, NULL);
vma = i915_vma_instance(obj->gem_obj, vm, NULL);
if (IS_ERR(vma)) {
DRM_ERROR("cannot find or create vma\n");
return -1;
@ -181,7 +182,7 @@ static int create_ipts_context(void)
return ret;
}
ipts_ctx = i915_gem_context_create_ipts(dev_priv);
ipts_ctx = i915_gem_context_create_ipts(intel_ipts.dev);
if (IS_ERR(ipts_ctx)) {
DRM_ERROR("Failed to create IPTS context (error %ld)\n",
PTR_ERR(ipts_ctx));
@ -323,7 +324,7 @@ static int set_wq_info(void)
return -EINVAL;
}
base = client->client_base;
base = client->vaddr;
desc = (struct guc_process_desc *)((u64)base + client->proc_desc_offset);
desc->wq_base_addr = (u64)base + client->wq_offset;
@ -443,7 +444,7 @@ static int intel_ipts_map_buffer(u64 gfx_handle, intel_ipts_mapbuffer_t *mapbuf)
vm = &dev_priv->ggtt.base;
}
vma = i915_gem_obj_lookup_or_create_vma(obj->gem_obj, vm, NULL);
vma = i915_vma_instance(obj->gem_obj, vm, NULL);
if (IS_ERR(vma)) {
DRM_ERROR("cannot find or create vma\n");
return -EINVAL;
@ -481,6 +482,7 @@ static int intel_ipts_unmap_buffer(uint64_t gfx_handle, uint64_t buf_handle)
int intel_ipts_connect(intel_ipts_connect_t *ipts_connect)
{
struct drm_i915_private *dev_priv = intel_ipts.dev->dev_private;
int ret = 0;
if (!intel_ipts.initialized)
@ -493,7 +495,7 @@ int intel_ipts_connect(intel_ipts_connect_t *ipts_connect)
ipts_connect->ipts_ops.get_wq_info = intel_ipts_get_wq_info;
ipts_connect->ipts_ops.map_buffer = intel_ipts_map_buffer;
ipts_connect->ipts_ops.unmap_buffer = intel_ipts_unmap_buffer;
ipts_connect->gfx_version = INTEL_INFO(intel_ipts.dev)->gen;
ipts_connect->gfx_version = INTEL_INFO(dev_priv)->gen;
ipts_connect->gfx_handle = (uint64_t)&intel_ipts;
/* save callback and data */

2
drivers/gpu/drm/i915/intel_lrc.c
View file

@ -214,7 +214,7 @@
#define WA_TAIL_DWORDS 2
static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
struct intel_engine_cs *engine);
static void execlists_init_reg_state(u32 *reg_state,
struct i915_gem_context *ctx,

4
drivers/gpu/drm/i915/intel_panel.c
View file

@ -713,7 +713,7 @@ static void lpt_disable_backlight(struct intel_connector *connector)
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 tmp;
if (INTEL_GEN(connector->base.dev) >= 9 && i915.enable_guc_submission)
if (INTEL_GEN(dev_priv) >= 9 && i915.enable_guc_submission)
intel_ipts_notify_backlight_status(false);
intel_panel_actually_set_backlight(connector, 0);
@ -886,7 +886,7 @@ static void lpt_enable_backlight(struct intel_connector *connector)
/* This won't stick until the above enable. */
intel_panel_actually_set_backlight(connector, panel->backlight.level);
if (INTEL_GEN(connector->base.dev) >= 9 && i915.enable_guc_submission)
if (INTEL_GEN(dev_priv) >= 9 && i915.enable_guc_submission)
intel_ipts_notify_backlight_status(true);
}