Commit 88a1c40a authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add JPEG HW IP and SW structures 



It will be used for JPEG IP 1.0, 2.0, 2.5 and later.

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0bb419c7

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "amdgpu_uvd.h"

#include "amdgpu_vce.h"

#include "amdgpu_vcn.h"

#include "amdgpu_jpeg.h"

#include "amdgpu_mn.h"

#include "amdgpu_gmc.h"

#include "amdgpu_gfx.h"
@@ -704,6 +705,7 @@ enum amd_hw_ip_block_type { 
	MP1_HWIP,

	UVD_HWIP,

	VCN_HWIP = UVD_HWIP,

	JPEG_HWIP = VCN_HWIP,

	VCE_HWIP,

	DF_HWIP,

	DCE_HWIP,
@@ -899,6 +901,9 @@ struct amdgpu_device { 
	/* vcn */

	struct amdgpu_vcn		vcn;



	/* jpeg */

	struct amdgpu_jpeg		jpeg;



	/* firmwares */

	struct amdgpu_firmware		firmware;

drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#ifndef __AMDGPU_JPEG_H__

#define __AMDGPU_JPEG_H__



#define AMDGPU_MAX_JPEG_INSTANCES	2



struct amdgpu_jpeg_reg{

	unsigned jpeg_pitch;

};



struct amdgpu_jpeg_inst {

	struct amdgpu_ring ring_dec;

	struct amdgpu_irq_src irq;

	struct amdgpu_jpeg_reg external;

};



struct amdgpu_jpeg {

	uint8_t	num_jpeg_inst;

	struct amdgpu_jpeg_inst inst[AMDGPU_MAX_JPEG_INSTANCES];

	struct amdgpu_jpeg_reg internal;

	unsigned harvest_config;

};



#endif /*__AMDGPU_JPEG_H__*/