Commit 20573d8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Two regression fixes:

   - fix atomisp support for ISP2400

   - fix dvb-usb regression for TeVii s480 dual DVB-S2 S660 board"

* tag 'media/v6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: atomisp: Fix streaming no longer working on BYT / ISP2400 devices
  media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
parents 6e80a1fd 63de936b

drivers/media/usb/dvb-usb/dvb-usb-init.c

+4 −31
Original line number Diff line number Diff line
@@ -23,40 +23,11 @@ static int dvb_usb_force_pid_filter_usage; 
module_param_named(force_pid_filter_usage, dvb_usb_force_pid_filter_usage, int, 0444);

MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID filter, if any (default: 0).");



static int dvb_usb_check_bulk_endpoint(struct dvb_usb_device *d, u8 endpoint)

{

	if (endpoint) {

		int ret;



		ret = usb_pipe_type_check(d->udev, usb_sndbulkpipe(d->udev, endpoint));

		if (ret)

			return ret;

		ret = usb_pipe_type_check(d->udev, usb_rcvbulkpipe(d->udev, endpoint));

		if (ret)

			return ret;

	}

	return 0;

}



static void dvb_usb_clear_halt(struct dvb_usb_device *d, u8 endpoint)

{

	if (endpoint) {

		usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, endpoint));

		usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, endpoint));

	}

}



static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)

{

	struct dvb_usb_adapter *adap;

	int ret, n, o;



	ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint);

	if (ret)

		return ret;

	ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint_response);

	if (ret)

		return ret;

	for (n = 0; n < d->props.num_adapters; n++) {

		adap = &d->adapter[n];

		adap->dev = d;
@@ -132,8 +103,10 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) 
	 * when reloading the driver w/o replugging the device

	 * sometimes a timeout occurs, this helps

	 */

	dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint);

	dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint_response);

	if (d->props.generic_bulk_ctrl_endpoint != 0) {

		usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));

		usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));

	}



	return 0;

drivers/staging/media/atomisp/pci/ia_css_stream_public.h

+6 −2
Original line number Diff line number Diff line
@@ -27,12 +27,16 @@ 
#include "ia_css_prbs.h"

#include "ia_css_input_port.h"



/* Input modes, these enumerate all supported input modes.

/*

 * Input modes, these enumerate all supported input modes.

 * This enum is part of the atomisp firmware ABI and must

 * NOT be changed!

 * Note that not all ISP modes support all input modes.

 */

enum ia_css_input_mode {

	IA_CSS_INPUT_MODE_SENSOR, /** data from sensor */

	IA_CSS_INPUT_MODE_FIFO,   /** data from input-fifo */

	IA_CSS_INPUT_MODE_TPG,    /** data from test-pattern generator */

	IA_CSS_INPUT_MODE_PRBS,   /** data from pseudo-random bit stream */

	IA_CSS_INPUT_MODE_MEMORY, /** data from a frame in memory */

	IA_CSS_INPUT_MODE_BUFFERED_SENSOR /** data is sent through mipi buffer */

drivers/staging/media/atomisp/pci/sh_css_internal.h

+16 −3
Original line number Diff line number Diff line
@@ -344,7 +344,14 @@ struct sh_css_sp_input_formatter_set { 


#define IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT (3)



/* SP configuration information */

/*

 * SP configuration information

 *

 * This struct is part of the atomisp firmware ABI and is directly copied

 * to ISP DRAM by sh_css_store_sp_group_to_ddr()

 *

 * Do NOT change this struct's layout or remove seemingly unused fields!

 */

struct sh_css_sp_config {

	u8			no_isp_sync; /* Signal host immediately after start */

	u8			enable_raw_pool_locking; /** Enable Raw Buffer Locking for HALv3 Support */
@@ -354,6 +361,10 @@ struct sh_css_sp_config { 
	     host (true) or when they are passed to the preview/video pipe

	     (false). */



	 /*

	  * Note the fields below are only used on the ISP2400 not on the ISP2401,

	  * sh_css_store_sp_group_to_ddr() skip copying these when run on the ISP2401.

	  */

	struct {

		u8					a_changed;

		u8					b_changed;
@@ -363,10 +374,12 @@ struct sh_css_sp_config { 
	} input_formatter;



	sync_generator_cfg_t	sync_gen;

	tpg_cfg_t		tpg;

	prbs_cfg_t		prbs;

	input_system_cfg_t	input_circuit;

	u8			input_circuit_cfg_changed;

	u32			mipi_sizes_for_check[N_CSI_PORTS][IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT];

	/* These last 2 fields are used on both the ISP2400 and the ISP2401 */

	u8			enable_isys_event_queue;

	u8			disable_cont_vf;

};