diff mbox series

[2/7] drm: Drop drmP.h from drm_connector.c

Message ID 20180905135711.28370-2-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show
Series [1/7] drm: Add drm/drm_util.h header file | expand

Commit Message

Daniel Vetter Sept. 5, 2018, 1:57 p.m. UTC 
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!

v2: Compiles now, with drm/kernel.h extracted.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
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(-)

Comments

Sam Ravnborg Sept. 5, 2018, 5:12 p.m. UTC | #1 
On Wed, Sep 05, 2018 at 03:57:06PM +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!
> 
> v2: Compiles now, with drm/kernel.h extracted.
1) It is now named drm_util.h (the drm_util name makes more sense to me)
2) patch revision info belongs outside the changelog part - no?

	Sam
Daniel Vetter Sept. 5, 2018, 5:22 p.m. UTC | #2 
On Wed, Sep 5, 2018 at 7:12 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> On Wed, Sep 05, 2018 at 03:57:06PM +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!
>>
>> v2: Compiles now, with drm/kernel.h extracted.
> 1) It is now named drm_util.h (the drm_util name makes more sense to me)

Ah right, I'll fix up when applying or respinning, whichever comes first.

> 2) patch revision info belongs outside the changelog part - no?

If it's information worth writing it's information worth recording. In
drm we're pretty much ok with whatever you feel like, and most people
include the patch revision in the commit message. Too many cases where
critical information was left out and a patch made no sense at all
anymore half a year down the road.
-Daniel
Sam Ravnborg Sept. 5, 2018, 7:44 p.m. UTC | #3 
> 
> > 2) patch revision info belongs outside the changelog part - no?
> 
> If it's information worth writing it's information worth recording. In
> drm we're pretty much ok with whatever you feel like, and most people
> include the patch revision in the commit message. Too many cases where
> critical information was left out and a patch made no sense at all
> anymore half a year down the road.
Noted, thanks for the explanation.

	Sam
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 6011d769d50b..526619f963e5 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>
+
+#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);