On Thu, Mar 22, 2012 at 02:38:45PM -0700, Jesse Barnes wrote:
> For use by the rest of the ValleyView code.
>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 18 ++++++++++++++++++
> drivers/gpu/drm/i915/i915_drv.h | 2 ++
> 2 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 06533cb..4a0e415 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -248,6 +248,24 @@ static const struct intel_device_info intel_ivybridge_m_info = {
> .has_llc = 1,
> };
>
> +static const struct intel_device_info intel_valleyview_m_info = {
> + .gen = 7, .is_mobile = 1,
> + .need_gfx_hws = 1, .has_hotplug = 1,
> + .has_fbc = 0,
> + .has_bsd_ring = 1,
> + .has_blt_ring = 1,
> + .is_valleyview = 1,
> +};
> +
> +static const struct intel_device_info intel_valleyview_d_info = {
> + .gen = 7, .is_mobile = 1,
> + .need_gfx_hws = 1, .has_hotplug = 1,
> + .has_fbc = 0,
> + .has_bsd_ring = 1,
> + .has_blt_ring = 1,
> + .is_valleyview = 1,
> +};
> +
> static const struct pci_device_id pciidlist[] = { /* aka */
> INTEL_VGA_DEVICE(0x3577, &intel_i830_info), /* I830_M */
> INTEL_VGA_DEVICE(0x2562, &intel_845g_info), /* 845_G */
is intel_valleyview_d_info supposed to be is_mobile=1?
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 83ace70..cacc8d3 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -255,6 +255,7 @@ struct intel_device_info {
> u8 is_broadwater:1;
> u8 is_crestline:1;
> u8 is_ivybridge:1;
> + u8 is_valleyview:1;
> u8 has_fbc:1;
> u8 has_pipe_cxsr:1;
> u8 has_hotplug:1;
> @@ -1001,6 +1002,7 @@ struct drm_i915_file_private {
> #define IS_IRONLAKE_D(dev) ((dev)->pci_device == 0x0042)
> #define IS_IRONLAKE_M(dev) ((dev)->pci_device == 0x0046)
> #define IS_IVYBRIDGE(dev) (INTEL_INFO(dev)->is_ivybridge)
> +#define IS_VALLEYVIEW(dev) (INTEL_INFO(dev)->is_valleyview)
> #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile)
>
> /*
Assuming you fix is_mobile, or confirm it to be correct
Acked-by: Ben Widawsky <ben at bwidawsk.net>
