Skip to content

Commit

Permalink
log and debug
Browse files Browse the repository at this point in the history 
Tracked-On: OAM-121827
Signed-off-by: Xue, Bosheng <bosheng.xue@intel.com>
  • Loading branch information
@bosheng1
bosheng1 committed Jan 9, 2025
1 parent 22a3eca commit e7abbe5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags)
{
struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
if (i915_gem_object_is_protected(obj))
if (i915_gem_object_is_protected(obj)) {
exp_info.exp_name = "i915_protected";

}
exp_info.ops = &i915_dmabuf_ops;
exp_info.size = gem_obj->size;
exp_info.flags = flags;
Expand Down
16 changes: 8 additions & 8 deletions drivers/gpu/drm/i915/pxp/virt/intel_pxp_fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static void pxp_fe_session_work(struct work_struct *work)
if (!events)
return;

printk("PXP FE: processing event-flags 0x%08x", events);
//printk("PXP FE: processing event-flags 0x%08x", events);

if (events & PXP_INVAL_REQUIRED) {
intel_pxp_invalidate(pxp_fe->i915->pxp);
Expand All @@ -143,7 +143,7 @@ int pxp_bind(void *gpu_priv, void *pxp_priv)
struct virtio_pxp *vpxp = (struct virtio_pxp *)pxp_priv;
if (!pxp || !vpxp)
return -1;
printk("pxp bind\n");
printk("%s\n",__FUNCTION__);
pxp->fe.vpxp = vpxp;
pxp->fe.enabled = true;
pxp->fe.max_sessions = vpxp->sessions;
Expand All @@ -159,7 +159,7 @@ void pxp_unbind(void *gpu_priv)
struct intel_pxp *pxp = (struct intel_pxp *)gpu_priv;
if (!pxp)
return;
printk("pxp unbind\n");
printk("%s\n",__FUNCTION__);
pxp->fe.enabled = false;
}

Expand Down Expand Up @@ -320,7 +320,7 @@ int intel_pxp_fe_sm_ioctl_reserve_session(struct intel_pxp *pxp, struct drm_file
ret = virtio_set_session(pxp->fe.vpxp, &params);
*pxp_tag = params.pxp_tag;
session_id = *pxp_tag & PRELIM_DRM_I915_PXP_TAG_SESSION_ID_MASK;
printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
//printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
if (session_id >= INTEL_PXP_MAX_HWDRM_SESSIONS || session_id < 0) {
DRM_ERROR("PXP FE: invalid session id:%d", session_id);
return -1;
Expand Down Expand Up @@ -349,7 +349,7 @@ int intel_pxp_fe_sm_ioctl_mark_session_in_play(struct intel_pxp *pxp,
params.pxp_tag = session_id;
params.req_session_state = PRELIM_DRM_I915_PXP_REQ_SESSION_IN_PLAY;
ret = virtio_set_session(pxp->fe.vpxp, &params);
printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
//printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
if (ret < 0)
return ret;
pxp->fe.hwdrm_sessions[session_id].is_valid = true;
Expand All @@ -374,7 +374,7 @@ int intel_pxp_fe_sm_ioctl_terminate_session(struct intel_pxp *pxp,
params.pxp_tag = session_id;
params.req_session_state = PRELIM_DRM_I915_PXP_REQ_SESSION_TERMINATE;
ret = virtio_set_session(pxp->fe.vpxp, &params);
printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
//printk("%s, session_id:%d, ret:%d\n",__FUNCTION__, session_id, ret);
return ret;
}

Expand All @@ -394,7 +394,7 @@ int intel_pxp_fe_io_message(struct intel_pxp *pxp,
params.msg_out = (u64)msg_out;
params.msg_out_buf_size = msg_out_max_size;
ret = virtio_io_msg(pxp->fe.vpxp, &params);
printk("%s, ret:%d, ret size:%d\n",__FUNCTION__, ret, params.msg_out_ret_size);
//printk("%s, ret:%d, ret size:%d\n",__FUNCTION__, ret, params.msg_out_ret_size);
*msg_out_rcv_size = params.msg_out_ret_size;
return ret;
}
Expand All @@ -416,7 +416,7 @@ int intel_pxp_fe_sm_ioctl_query_pxp_tag(struct intel_pxp *pxp,
ret = virtio_query_tag(pxp->fe.vpxp, &params);
*pxp_tag = params.pxp_tag;
*session_is_alive = params.session_is_alive;
printk("%s, ret:%d\n",__FUNCTION__, ret);
//printk("%s, ret:%d\n",__FUNCTION__, ret);
return ret;
}

Expand Down
6 changes: 1 addition & 5 deletions drivers/gpu/drm/i915/pxp/virt/virtio_pxp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ static void virtpxp_recv_events(struct virtqueue *vq)
unsigned int *event;
unsigned long flags;
unsigned int len;
printk("bosheng virtpxp_recv_events\n");

spin_lock_irqsave(&vpxp->event_lock, flags);
while ((event = virtqueue_get_buf(vq, &len)) != NULL) {
spin_unlock_irqrestore(&vpxp->event_lock, flags);
printk("bosheng virtpxp_recv_events 1\n");
spin_lock_irqsave(&pxp_lock, flags);
if (vpxp->irq_recv)
vpxp->irq_recv(*event, vpxp->cb_priv);
Expand All @@ -64,12 +62,10 @@ static void virtpxp_control(struct virtqueue *vq)
unsigned long flags;
unsigned int len;

printk("bosheng virtpxp_control\n");
spin_lock_irqsave(&vpxp->control_lock, flags);
while ((request = virtqueue_get_buf(vq, &len)) != NULL) {
spin_unlock_irqrestore(&vpxp->control_lock, flags);
request->rxlen = len;
printk("bosheng virtpxp_control completion\n");
complete(&request->completion);
spin_lock_irqsave(&vpxp->control_lock, flags);
}
Expand All @@ -96,7 +92,7 @@ static int virtpxp_init_vqs(struct virtio_pxp *vpxp)
static void vpxp_free(struct kref *kref)
{
struct virtio_pxp *vpxp;
printk("bosheng vpxp_free\n");
printk("vpxp device free\n");
vpxp = container_of(kref, typeof(*vpxp), ref);
kfree(vpxp);
vpxp = NULL;
Expand Down

0 comments on commit e7abbe5

Please sign in to comment.