From patchwork Wed Jun 13 15:07:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 138505 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp857185lji; Wed, 13 Jun 2018 08:16:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKINZbloluRG5TUYq8k7OBOSdpnK4UrU8H90FpFFT7VRKLfHnVKs4dXZD8Nlveuo28bVsRZK X-Received: by 2002:a62:9513:: with SMTP id p19-v6mr5311400pfd.239.1528902991676; Wed, 13 Jun 2018 08:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528902991; cv=none; d=google.com; s=arc-20160816; b=wCLHqzy0/I7rOPJvVRic8J8exBkIiZ1DuaWBnGFqCVy1flAmcDJjTUAHwynOTOue0W oeHMsVu1VDlqG65h0WU8pdxvWIQetRv4EZ3P0VCiDM43P6BYjIaj4FnvPFQCeOtUJbv7 ZIq82MOnEi7DL7wd7pvLptfQUiIRJHlnpqekj4LfUMueO5V6C2CUHBke6F6Dgc7nh0u6 6OzHCsQVbiITlmjoX9E1WOW1TPNHGu7jkhZzBUrJrhronu5Yg74/SO28kvjz9QsT/J9B vHfDg485fjGxbGZtHW9c9EDylIGgdhFm+s2od+Skumc4VJ/bpe925LIVt7MpodvV+0hS d2Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Q4VOjPiepSlhJERfbnnBhuea6lSxKsWxYzdpU/r/kD8=; b=1Gv96xnnefXP+iSRISzgPELv+cXifiv7BHjjNN5OgQX5S4uLvGG3r9kNduFfvckluO qLKmaHfvWKYTRH1PcuY36M0IPNcAaQ9F7yOLI6B+nKQdYal10iPafEJrH4vocQ7FUmOe nxVtzxIo9hGjKB76J94YwsqYjJVRsVAfldgGeR2lfkDyqnGNrTss7XFwLugyxd+38sll caoCx2N+nltbXivFIX7ix2pwPukiiBpmgbYmM3MQjmeEJKFk8Mt4upqoV7joPYLjHVtI rTFPc53vvhq3hsmYLCkaMAlmRJSfasno0Hk/EZgJjSwRo2vmjVWDoav5k9pbZwqWdF/A 21rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QZfCkU98; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e17-v6si2441498pgv.160.2018.06.13.08.16.31; Wed, 13 Jun 2018 08:16:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QZfCkU98; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936132AbeFMPQ2 (ORCPT + 30 others); Wed, 13 Jun 2018 11:16:28 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35150 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935694AbeFMPJJ (ORCPT ); Wed, 13 Jun 2018 11:09:09 -0400 Received: by mail-wm0-f51.google.com with SMTP id j15-v6so6157879wme.0 for ; Wed, 13 Jun 2018 08:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q4VOjPiepSlhJERfbnnBhuea6lSxKsWxYzdpU/r/kD8=; b=QZfCkU98S1pD2aXixdruDJOauHbv+jvetmIfkZlUmB6xJWjFcdjWU5BvNs6NwgUuhi jDapxaI5O50AHYpoyLVdD/WEomCKG72FVEtW+OMvGup5tgoM3AmmmxofThSFMyMc6j8n PReTbcF/wGmiQ2yKZBL+0OA6Y/Jjhk+PFKvjs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Q4VOjPiepSlhJERfbnnBhuea6lSxKsWxYzdpU/r/kD8=; b=RgKtfeomCD+MRfImNxcL1gmKs8eV5C2GbpsME5cQ7cnRzyH5wHKIYXnlBXHcqSLHNv lDmIiUNgGWXw7s1L0wEuTJlq7BJwOhKzfRKX06+m+RAfACAg6yq3T2H5oc3Mdq18GULW 9WHzBbo+dtc+IMMluHNqq0oOllyNqM4MfimNeMZ2313HngRgkZyDOBr54L74G0AUYWJf 71RpC2tOJKMgjYxV7Ju/NpOV8wy3LDsi/pouJ7QAxdU7R96trpIbACLcsD1dsQzg1LtZ Al8XV/yfpjmNMYlxsAPvTWl3FQQR8tjQsGVGh1qxZnoILWgOT8eYg0okUgLEStIemOVL VkJA== X-Gm-Message-State: APt69E30X5BjiMoZYDVCKNQ2UILG8n6BM3v433T/4kiKQp1iJf5iXa3+ OecG/hEGhNgjLqpzmoGpXw1ApA== X-Received: by 2002:a1c:b6c3:: with SMTP id g186-v6mr3715290wmf.40.1528902547703; Wed, 13 Jun 2018 08:09:07 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id e13-v6sm2886548wrm.45.2018.06.13.08.09.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 08:09:07 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vikash Garodia , Tomasz Figa , Stanimir Varbanov Subject: [PATCH v3 03/27] venus: hfi: update sequence event to handle more properties Date: Wed, 13 Jun 2018 18:07:37 +0300 Message-Id: <20180613150801.11702-4-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180613150801.11702-1-stanimir.varbanov@linaro.org> References: <20180613150801.11702-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HFI version 4xx can pass more properties in the sequence change event, extend the event structure with them. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi.h | 10 +++++++ drivers/media/platform/qcom/venus/hfi_msgs.c | 44 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) -- 2.14.1 diff --git a/drivers/media/platform/qcom/venus/hfi.h b/drivers/media/platform/qcom/venus/hfi.h index 5466b7d60dd0..6038d8e0ab22 100644 --- a/drivers/media/platform/qcom/venus/hfi.h +++ b/drivers/media/platform/qcom/venus/hfi.h @@ -74,6 +74,16 @@ struct hfi_event_data { u32 tag; u32 profile; u32 level; + /* the following properties start appear from v4 onwards */ + u32 bit_depth; + u32 pic_struct; + u32 colour_space; + u32 entropy_mode; + u32 buf_count; + struct { + u32 left, top; + u32 width, height; + } input_crop; }; /* define core states */ diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c index 589e1a6b36a9..54cd41e5837c 100644 --- a/drivers/media/platform/qcom/venus/hfi_msgs.c +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c @@ -25,10 +25,16 @@ static void event_seq_changed(struct venus_core *core, struct venus_inst *inst, struct hfi_msg_event_notify_pkt *pkt) { + enum hfi_version ver = core->res->hfi_version; struct hfi_event_data event = {0}; int num_properties_changed; struct hfi_framesize *frame_sz; struct hfi_profile_level *profile_level; + struct hfi_bit_depth *pixel_depth; + struct hfi_pic_struct *pic_struct; + struct hfi_colour_space *colour_info; + struct hfi_buffer_requirements *bufreq; + struct hfi_extradata_input_crop *crop; u8 *data_ptr; u32 ptype; @@ -69,6 +75,44 @@ static void event_seq_changed(struct venus_core *core, struct venus_inst *inst, event.level = profile_level->level; data_ptr += sizeof(*profile_level); break; + case HFI_PROPERTY_PARAM_VDEC_PIXEL_BITDEPTH: + data_ptr += sizeof(u32); + pixel_depth = (struct hfi_bit_depth *)data_ptr; + event.bit_depth = pixel_depth->bit_depth; + data_ptr += sizeof(*pixel_depth); + break; + case HFI_PROPERTY_PARAM_VDEC_PIC_STRUCT: + data_ptr += sizeof(u32); + pic_struct = (struct hfi_pic_struct *)data_ptr; + event.pic_struct = pic_struct->progressive_only; + data_ptr += sizeof(*pic_struct); + break; + case HFI_PROPERTY_PARAM_VDEC_COLOUR_SPACE: + data_ptr += sizeof(u32); + colour_info = (struct hfi_colour_space *)data_ptr; + event.colour_space = colour_info->colour_space; + data_ptr += sizeof(*colour_info); + break; + case HFI_PROPERTY_CONFIG_VDEC_ENTROPY: + data_ptr += sizeof(u32); + event.entropy_mode = *(u32 *)data_ptr; + data_ptr += sizeof(u32); + break; + case HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS: + data_ptr += sizeof(u32); + bufreq = (struct hfi_buffer_requirements *)data_ptr; + event.buf_count = HFI_BUFREQ_COUNT_MIN(bufreq, ver); + data_ptr += sizeof(*bufreq); + break; + case HFI_INDEX_EXTRADATA_INPUT_CROP: + data_ptr += sizeof(u32); + crop = (struct hfi_extradata_input_crop *)data_ptr; + event.input_crop.left = crop->left; + event.input_crop.top = crop->top; + event.input_crop.width = crop->width; + event.input_crop.height = crop->height; + data_ptr += sizeof(*crop); + break; default: break; }