Re: [PATCH 05/16] viafb: Determine type of 2D engine and store itin chip_info

[Florian Tobias Schandinat]

Jonathan Corbet schrieb:
> From: Harald Welte <laforge@xxxxxxxxxxxx>
>
> This will help us for the upcoming support for 2D acceleration using
> the M1 engine.
>
> [jc: fixed merge conflicts]
> Signed-off-by: Harald Welte <HaraldWelte@xxxxxxxxxxx>

That's probably a good idea (although most things are already done in 
the separate blitting functions).
Just a minor nit:
Could we change the default so that if someone adds support for a new 
IGP (and misses this function) we default to either the newest or 
preferably to none? I've just seen too much poorly maintained code in 
this driver and defaulting to the oldest is hence a bad idea.
Otherwise it's fine.


Thanks,

Florian Tobias Schandinat

> ---
>  drivers/video/via/chip.h |    8 ++++++++
>  drivers/video/via/hw.c   |   15 +++++++++++++++
>  2 files changed, 23 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
> index 474f428..f799e2c 100644
> --- a/drivers/video/via/chip.h
> +++ b/drivers/video/via/chip.h
> @@ -122,9 +122,17 @@ struct lvds_chip_information {
>  	int i2c_port;
>  };
>  
> +/* The type of 2D engine */
> +enum via_2d_engine {
> +	VIA_2D_ENG_H2,
> +	VIA_2D_ENG_H5,
> +	VIA_2D_ENG_M1,
> +};
> +
>  struct chip_information {
>  	int gfx_chip_name;
>  	int gfx_chip_revision;
> +	enum via_2d_engine twod_engine;
>  	struct tmds_chip_information tmds_chip_info;
>  	struct lvds_chip_information lvds_chip_info;
>  	struct lvds_chip_information lvds_chip_info2;
> diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
> index f2e4bda..963704e 100644
> --- a/drivers/video/via/hw.c
> +++ b/drivers/video/via/hw.c
> @@ -2034,6 +2034,21 @@ static void init_gfx_chip_info(struct pci_dev *pdev,
>  				CX700_REVISION_700;
>  		}
>  	}
> +
> +	/* Determine which 2D engine we have */
> +	switch (viaparinfo->chip_info->gfx_chip_name) {
> +	case UNICHROME_VX800:
> +	case UNICHROME_VX855:
> +		viaparinfo->chip_info->twod_engine = VIA_2D_ENG_M1;
> +		break;
> +	case UNICHROME_K8M890:
> +	case UNICHROME_P4M900:
> +		viaparinfo->chip_info->twod_engine = VIA_2D_ENG_H5;
> +		break;
> +	default:
> +		viaparinfo->chip_info->twod_engine = VIA_2D_ENG_H2;
> +		break;
> +	}
>  }
>  
>  static void init_tmds_chip_info(void)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/