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

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nouveau_platform.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.h b/drivers/gpu/drm/nouveau/nouveau_platform.h
index 392874cf47257b47f8e265a166851db1d25e6edd..f41056d0f5f49b65ecb32814054f29daa77bc9c7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_platform.h
+++ b/drivers/gpu/drm/nouveau/nouveau_platform.h
@@ -19,54 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 #ifndef __NOUVEAU_PLATFORM_H__
 #define __NOUVEAU_PLATFORM_H__
-
-#include "core/device.h"
-#include "core/mm.h"
-
-struct reset_control;
-struct clk;
-struct regulator;
-struct iommu_domain;
-struct platform_driver;
-
-struct nouveau_platform_gpu {
-       struct reset_control *rst;
-       struct clk *clk;
-       struct clk *clk_pwr;
-
-       struct regulator *vdd;
-
-       struct {
-               /*
-                * Protects accesses to mm from subsystems
-                */
-               struct mutex mutex;
-
-               struct nvkm_mm _mm;
-               /*
-                * Just points to _mm. We need this to avoid embedding
-                * struct nvkm_mm in os.h
-                */
-               struct nvkm_mm *mm;
-               struct iommu_domain *domain;
-               unsigned long pgshift;
-       } iommu;
-};
-
-struct nouveau_platform_device {
-       struct nvkm_device device;
-
-       struct nouveau_platform_gpu *gpu;
-
-       int gpu_speedo;
-};
-
-#define nv_device_to_platform(d)                                               \
-       container_of(d, struct nouveau_platform_device, device)
+#include "nouveau_drm.h"
 
 extern struct platform_driver nouveau_platform_driver;
-
 #endif