Commit 55004938 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next 

Summary of what's included:

- SGX MMU support
- SGX IRQ handling (Page faults and blitter fences)
- Minor Cedarview and Poulsbo unification
- Work queue for ASLE interrupt work
- Various cleanups, style fixes and removal of dead code

* 'gma500-next' of git://github.com/patjak/drm-gma500:
  drm/gma500: remove stub .open/postclose
  drm/gma500: Code cleanup - inline documentation
  drm/gma500: Code cleanup - style fixes
  drm/gma500: Code cleanup - removal of centralized exiting of function
  drm/gma500/cdv: Cedarview display cleanups
  drm/gma500: Unify encoder mode fixup
  drm/gma500: Unify _get_core_freq for cdv and psb
  drm/gma500: Move asle interrupt work into a work task
  drm/gma500: Remove dead code
  drm/gma500: Add backing type and base align to psb_gem_create()
  drm/gma500: Remove unused ioctls
  drm/gma500: Always trap MMU page faults
  drm/gma500: Hook up the MMU
  drm/gma500: Add first piece of blitter code
  drm/gma500: Give MMU code it's own header file
  drm/gma500: Add support for SGX interrupts
  drm/gma500: Make SGX MMU driver actually do something
parents e84c20af 75144097

drivers/gpu/drm/gma500/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ gma500_gfx-y += \ 
	  intel_i2c.o \

	  intel_gmbus.o \

	  mmu.o \

	  blitter.o \

	  power.o \

	  psb_drv.o \

	  gma_display.o \

	  gma_device.o \

	  psb_intel_display.o \

	  psb_intel_lvds.o \

	  psb_intel_modes.o \

drivers/gpu/drm/gma500/blitter.c

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

 * Copyright (c) 2014, Patrik Jakobsson

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * Authors: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

 */



#include "psb_drv.h"



#include "blitter.h"

#include "psb_reg.h"



/* Wait for the blitter to be completely idle */

int gma_blt_wait_idle(struct drm_psb_private *dev_priv)

{

	unsigned long stop = jiffies + HZ;

	int busy = 1;



	/* NOP for Cedarview */

	if (IS_CDV(dev_priv->dev))

		return 0;



	/* First do a quick check */

	if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) &&

	    ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & _PSB_C2B_STATUS_BUSY) == 0))

		return 0;



	do {

		busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);

	} while (busy && !time_after_eq(jiffies, stop));



	if (busy)

		return -EBUSY;



	do {

		busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &

			_PSB_C2B_STATUS_BUSY) != 0);

	} while (busy && !time_after_eq(jiffies, stop));



	/* If still busy, we probably have a hang */

	return (busy) ? -EBUSY : 0;

}

drivers/gpu/drm/gma500/blitter.h

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

 * Copyright (c) 2014, Patrik Jakobsson

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * Authors: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

 */



#ifndef __BLITTER_H

#define __BLITTER_H



extern int gma_blt_wait_idle(struct drm_psb_private *dev_priv);



#endif

drivers/gpu/drm/gma500/cdv_device.c

+2 −38
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "psb_intel_reg.h"

#include "intel_bios.h"

#include "cdv_device.h"

#include "gma_device.h"



#define VGA_SR_INDEX		0x3c4

#define VGA_SR_DATA		0x3c5
@@ -426,43 +427,6 @@ static int cdv_power_up(struct drm_device *dev) 
	return 0;

}



/* FIXME ? - shared with Poulsbo */

static void cdv_get_core_freq(struct drm_device *dev)

{

	uint32_t clock;

	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);

	struct drm_psb_private *dev_priv = dev->dev_private;



	pci_write_config_dword(pci_root, 0xD0, 0xD0050300);

	pci_read_config_dword(pci_root, 0xD4, &clock);

	pci_dev_put(pci_root);



	switch (clock & 0x07) {

	case 0:

		dev_priv->core_freq = 100;

		break;

	case 1:

		dev_priv->core_freq = 133;

		break;

	case 2:

		dev_priv->core_freq = 150;

		break;

	case 3:

		dev_priv->core_freq = 178;

		break;

	case 4:

		dev_priv->core_freq = 200;

		break;

	case 5:

	case 6:

	case 7:

		dev_priv->core_freq = 266;

		break;

	default:

		dev_priv->core_freq = 0;

	}

}



static void cdv_hotplug_work_func(struct work_struct *work)

{

        struct drm_psb_private *dev_priv = container_of(work, struct drm_psb_private,
@@ -618,7 +582,7 @@ static int cdv_chip_setup(struct drm_device *dev) 
	if (pci_enable_msi(dev->pdev))

		dev_warn(dev->dev, "Enabling MSI failed!\n");

	dev_priv->regmap = cdv_regmap;

	cdv_get_core_freq(dev);

	gma_get_core_freq(dev);

	psb_intel_opregion_init(dev);

	psb_intel_init_bios(dev);

	cdv_hotplug_enable(dev, false);

drivers/gpu/drm/gma500/cdv_intel_crt.c

+1 −8
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ static int cdv_intel_crt_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



static bool cdv_intel_crt_mode_fixup(struct drm_encoder *encoder,

				 const struct drm_display_mode *mode,

				 struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,

			       struct drm_display_mode *mode,

			       struct drm_display_mode *adjusted_mode)
@@ -224,7 +217,7 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector, 


static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {

	.dpms = cdv_intel_crt_dpms,

	.mode_fixup = cdv_intel_crt_mode_fixup,

	.mode_fixup = gma_encoder_mode_fixup,

	.prepare = gma_encoder_prepare,

	.commit = gma_encoder_commit,

	.mode_set = cdv_intel_crt_mode_set,

CRA Git | Maintained and supported by SUSTech CRA and CCSE