On Mon, Jul 09, 2018 at 10:40:03AM +0200, Daniel Vetter wrote:
Only needed minimal changes in drm_internal.h (for the drm_ioctl_t type and a few forward declarations), plus a few missing includes in drm_connector.c.
Yay, the last stage of the drm header cleanup can finally commence!
Note: This needs the patch to move for_each_if from drmP.h to kernel.h or it won't compile.
Signed-off-by: Daniel Vetter daniel.vetter@intel.com
drivers/gpu/drm/drm_connector.c | 6 +++++- drivers/gpu/drm/drm_internal.h | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 5ada0640de5a..dc5a480200d8 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -20,11 +20,15 @@
- OF THIS SOFTWARE.
*/
-#include <drm/drmP.h> #include <drm/drm_connector.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_utils.h> +#include <drm/drm_print.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h>
Whether intentional, or by luck, these were alphabetical. Can we please keep this convention?
With that nit and for_each_if,
Reviewed-by: Sean Paul seanpaul@chromium.org
+#include <linux/uaccess.h>
#include "drm_crtc_internal.h" #include "drm_internal.h" diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 40179c5fc6b8..0c4eb4a9ab31 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -21,9 +21,14 @@
- OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <drm/drm_ioctl.h>
#define DRM_IF_MAJOR 1 #define DRM_IF_MINOR 4
+struct drm_prime_file_private; +struct dma_buf;
/* drm_file.c */ extern struct mutex drm_global_mutex; struct drm_file *drm_file_alloc(struct drm_minor *minor); -- 2.18.0
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel