From: Christian Gmeiner Date: Mon, 29 Oct 2018 20:13:01 +0000 (+0100) Subject: Revert "imx: make use of loader_open_render_node(..) helper" X-Git-Tag: upstream/19.0.0~1864 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21d9b78289fadc09c0dc5cf82eef9e798a99b196;p=platform%2Fupstream%2Fmesa.git Revert "imx: make use of loader_open_render_node(..) helper" This reverts commit 773d6ea6e715d207bda3a53a9dfc8acf686035b0. Since kernel 4.17 (drm/etnaviv: remove the need for a gpu-subsystem DT node) the etnaviv DRM driver doesn't have an associated DT node anymore. This is technically correct, as the etnaviv device is a virtual device driving multiple hardware devices. Before 4.17 the userspace had access to the following information: DRIVER=etnaviv OF_NAME=gpu-subsystem OF_FULLNAME=/gpu-subsystem OF_COMPATIBLE_0=fsl,imx-gpu-subsystem OF_COMPATIBLE_N=1 MODALIAS=of:Ngpu-subsystemTCfsl,imx-gpu-subsystem DRIVER=imx-drm OF_NAME=display-subsystem OF_FULLNAME=/display-subsystem OF_COMPATIBLE_0=fsl,imx-display-subsystem OF_COMPATIBLE_N=1 Afer 4.17: DRIVER=etnaviv MODALIAS=platform:etnaviv The OF node has never been part of the etnaviv UABI, simply due to the fact that it's still possible to instantiate the etnaviv driver from a platform file, instead of a devicetree node. A patch set to fix this problem was send out [1] but it looks like that a proper solution needs more time to bake. [1] https://lists.freedesktop.org/archives/dri-devel/2018-October/194651.html Suggested-by: Emil Velikov Signed-off-by: Christian Gmeiner --- diff --git a/src/gallium/winsys/imx/drm/imx_drm_winsys.c b/src/gallium/winsys/imx/drm/imx_drm_winsys.c index 4bd2125..cd72610 100644 --- a/src/gallium/winsys/imx/drm/imx_drm_winsys.c +++ b/src/gallium/winsys/imx/drm/imx_drm_winsys.c @@ -26,7 +26,6 @@ #include "imx_drm_public.h" #include "etnaviv/drm/etnaviv_drm_public.h" -#include "loader/loader.h" #include "renderonly/renderonly.h" #include @@ -37,7 +36,7 @@ struct pipe_screen *imx_drm_screen_create(int fd) struct renderonly ro = { .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource, .kms_fd = fd, - .gpu_fd = loader_open_render_node("etnaviv") + .gpu_fd = open("/dev/dri/renderD128", O_RDWR | O_CLOEXEC) }; if (ro.gpu_fd < 0)