* [PATCH] drm/tegra: include drm/drm_edid.h only where needed
@ 2023-12-12 14:24 Jani Nikula
2023-12-12 21:56 ` kernel test robot
2023-12-13 10:19 ` [PATCH v2] " Jani Nikula
0 siblings, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2023-12-12 14:24 UTC (permalink / raw)
To: linux-tegra, dri-devel; +Cc: jani.nikula
Reduce the need for rebuilds when drm_edid.h is modified by including it
only where needed.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/tegra/drm.h | 2 +-
drivers/gpu/drm/tegra/output.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index ccb5d74fa227..682011166a8f 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -13,7 +13,6 @@
#include <drm/drm_atomic.h>
#include <drm/drm_bridge.h>
-#include <drm/drm_edid.h>
#include <drm/drm_encoder.h>
#include <drm/drm_fixed.h>
#include <drm/drm_probe_helper.h>
@@ -26,6 +25,7 @@
/* XXX move to include/uapi/drm/drm_fourcc.h? */
#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT_ULL(22)
+struct edid;
struct reset_control;
struct tegra_drm {
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index dc2dcb5ca1c8..88af956ad0e7 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -8,6 +8,7 @@
#include <linux/of.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_edid.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
#include <drm/drm_simple_kms_helper.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/tegra: include drm/drm_edid.h only where needed
2023-12-12 14:24 [PATCH] drm/tegra: include drm/drm_edid.h only where needed Jani Nikula
@ 2023-12-12 21:56 ` kernel test robot
2023-12-13 10:19 ` [PATCH v2] " Jani Nikula
1 sibling, 0 replies; 5+ messages in thread
From: kernel test robot @ 2023-12-12 21:56 UTC (permalink / raw)
To: Jani Nikula, linux-tegra, dri-devel; +Cc: oe-kbuild-all, jani.nikula
Hi Jani,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-misc/drm-misc-next drm-tip/drm-tip linus/master v6.7-rc5 next-20231212]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-tegra-include-drm-drm_edid-h-only-where-needed/20231212-222603
base: git://anongit.freedesktop.org/drm/drm drm-next
patch link: https://lore.kernel.org/r/20231212142409.3826544-1-jani.nikula%40intel.com
patch subject: [PATCH] drm/tegra: include drm/drm_edid.h only where needed
config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20231213/202312130548.FrTZXIdd-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231213/202312130548.FrTZXIdd-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202312130548.FrTZXIdd-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/gpu/drm/tegra/sor.c: In function 'tegra_sor_hdmi_setup_avi_infoframe':
>> drivers/gpu/drm/tegra/sor.c:1928:15: error: implicit declaration of function 'drm_hdmi_avi_infoframe_from_display_mode' [-Werror=implicit-function-declaration]
1928 | err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/drm_hdmi_avi_infoframe_from_display_mode +1928 drivers/gpu/drm/tegra/sor.c
459cc2c6800b54 Thierry Reding 2015-07-30 1911
459cc2c6800b54 Thierry Reding 2015-07-30 1912 static int
459cc2c6800b54 Thierry Reding 2015-07-30 1913 tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor,
459cc2c6800b54 Thierry Reding 2015-07-30 1914 const struct drm_display_mode *mode)
459cc2c6800b54 Thierry Reding 2015-07-30 1915 {
459cc2c6800b54 Thierry Reding 2015-07-30 1916 u8 buffer[HDMI_INFOFRAME_SIZE(AVI)];
459cc2c6800b54 Thierry Reding 2015-07-30 1917 struct hdmi_avi_infoframe frame;
459cc2c6800b54 Thierry Reding 2015-07-30 1918 u32 value;
459cc2c6800b54 Thierry Reding 2015-07-30 1919 int err;
459cc2c6800b54 Thierry Reding 2015-07-30 1920
459cc2c6800b54 Thierry Reding 2015-07-30 1921 /* disable AVI infoframe */
459cc2c6800b54 Thierry Reding 2015-07-30 1922 value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1923 value &= ~INFOFRAME_CTRL_SINGLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1924 value &= ~INFOFRAME_CTRL_OTHER;
459cc2c6800b54 Thierry Reding 2015-07-30 1925 value &= ~INFOFRAME_CTRL_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1926 tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1927
13d0add333afea Ville Syrjälä 2019-01-08 @1928 err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
13d0add333afea Ville Syrjälä 2019-01-08 1929 &sor->output.connector, mode);
459cc2c6800b54 Thierry Reding 2015-07-30 1930 if (err < 0) {
459cc2c6800b54 Thierry Reding 2015-07-30 1931 dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err);
459cc2c6800b54 Thierry Reding 2015-07-30 1932 return err;
459cc2c6800b54 Thierry Reding 2015-07-30 1933 }
459cc2c6800b54 Thierry Reding 2015-07-30 1934
459cc2c6800b54 Thierry Reding 2015-07-30 1935 err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));
459cc2c6800b54 Thierry Reding 2015-07-30 1936 if (err < 0) {
459cc2c6800b54 Thierry Reding 2015-07-30 1937 dev_err(sor->dev, "failed to pack AVI infoframe: %d\n", err);
459cc2c6800b54 Thierry Reding 2015-07-30 1938 return err;
459cc2c6800b54 Thierry Reding 2015-07-30 1939 }
459cc2c6800b54 Thierry Reding 2015-07-30 1940
459cc2c6800b54 Thierry Reding 2015-07-30 1941 tegra_sor_hdmi_write_infopack(sor, buffer, err);
459cc2c6800b54 Thierry Reding 2015-07-30 1942
459cc2c6800b54 Thierry Reding 2015-07-30 1943 /* enable AVI infoframe */
459cc2c6800b54 Thierry Reding 2015-07-30 1944 value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1945 value |= INFOFRAME_CTRL_CHECKSUM_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1946 value |= INFOFRAME_CTRL_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1947 tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1948
459cc2c6800b54 Thierry Reding 2015-07-30 1949 return 0;
459cc2c6800b54 Thierry Reding 2015-07-30 1950 }
459cc2c6800b54 Thierry Reding 2015-07-30 1951
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/tegra: include drm/drm_edid.h only where needed
@ 2023-12-12 21:56 ` kernel test robot
0 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2023-12-12 21:56 UTC (permalink / raw)
To: Jani Nikula, linux-tegra, dri-devel; +Cc: jani.nikula, oe-kbuild-all
Hi Jani,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-misc/drm-misc-next drm-tip/drm-tip linus/master v6.7-rc5 next-20231212]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-tegra-include-drm-drm_edid-h-only-where-needed/20231212-222603
base: git://anongit.freedesktop.org/drm/drm drm-next
patch link: https://lore.kernel.org/r/20231212142409.3826544-1-jani.nikula%40intel.com
patch subject: [PATCH] drm/tegra: include drm/drm_edid.h only where needed
config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20231213/202312130548.FrTZXIdd-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231213/202312130548.FrTZXIdd-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202312130548.FrTZXIdd-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/gpu/drm/tegra/sor.c: In function 'tegra_sor_hdmi_setup_avi_infoframe':
>> drivers/gpu/drm/tegra/sor.c:1928:15: error: implicit declaration of function 'drm_hdmi_avi_infoframe_from_display_mode' [-Werror=implicit-function-declaration]
1928 | err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/drm_hdmi_avi_infoframe_from_display_mode +1928 drivers/gpu/drm/tegra/sor.c
459cc2c6800b54 Thierry Reding 2015-07-30 1911
459cc2c6800b54 Thierry Reding 2015-07-30 1912 static int
459cc2c6800b54 Thierry Reding 2015-07-30 1913 tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor,
459cc2c6800b54 Thierry Reding 2015-07-30 1914 const struct drm_display_mode *mode)
459cc2c6800b54 Thierry Reding 2015-07-30 1915 {
459cc2c6800b54 Thierry Reding 2015-07-30 1916 u8 buffer[HDMI_INFOFRAME_SIZE(AVI)];
459cc2c6800b54 Thierry Reding 2015-07-30 1917 struct hdmi_avi_infoframe frame;
459cc2c6800b54 Thierry Reding 2015-07-30 1918 u32 value;
459cc2c6800b54 Thierry Reding 2015-07-30 1919 int err;
459cc2c6800b54 Thierry Reding 2015-07-30 1920
459cc2c6800b54 Thierry Reding 2015-07-30 1921 /* disable AVI infoframe */
459cc2c6800b54 Thierry Reding 2015-07-30 1922 value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1923 value &= ~INFOFRAME_CTRL_SINGLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1924 value &= ~INFOFRAME_CTRL_OTHER;
459cc2c6800b54 Thierry Reding 2015-07-30 1925 value &= ~INFOFRAME_CTRL_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1926 tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1927
13d0add333afea Ville Syrjälä 2019-01-08 @1928 err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
13d0add333afea Ville Syrjälä 2019-01-08 1929 &sor->output.connector, mode);
459cc2c6800b54 Thierry Reding 2015-07-30 1930 if (err < 0) {
459cc2c6800b54 Thierry Reding 2015-07-30 1931 dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err);
459cc2c6800b54 Thierry Reding 2015-07-30 1932 return err;
459cc2c6800b54 Thierry Reding 2015-07-30 1933 }
459cc2c6800b54 Thierry Reding 2015-07-30 1934
459cc2c6800b54 Thierry Reding 2015-07-30 1935 err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));
459cc2c6800b54 Thierry Reding 2015-07-30 1936 if (err < 0) {
459cc2c6800b54 Thierry Reding 2015-07-30 1937 dev_err(sor->dev, "failed to pack AVI infoframe: %d\n", err);
459cc2c6800b54 Thierry Reding 2015-07-30 1938 return err;
459cc2c6800b54 Thierry Reding 2015-07-30 1939 }
459cc2c6800b54 Thierry Reding 2015-07-30 1940
459cc2c6800b54 Thierry Reding 2015-07-30 1941 tegra_sor_hdmi_write_infopack(sor, buffer, err);
459cc2c6800b54 Thierry Reding 2015-07-30 1942
459cc2c6800b54 Thierry Reding 2015-07-30 1943 /* enable AVI infoframe */
459cc2c6800b54 Thierry Reding 2015-07-30 1944 value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1945 value |= INFOFRAME_CTRL_CHECKSUM_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1946 value |= INFOFRAME_CTRL_ENABLE;
459cc2c6800b54 Thierry Reding 2015-07-30 1947 tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
459cc2c6800b54 Thierry Reding 2015-07-30 1948
459cc2c6800b54 Thierry Reding 2015-07-30 1949 return 0;
459cc2c6800b54 Thierry Reding 2015-07-30 1950 }
459cc2c6800b54 Thierry Reding 2015-07-30 1951
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] drm/tegra: include drm/drm_edid.h only where needed
2023-12-12 14:24 [PATCH] drm/tegra: include drm/drm_edid.h only where needed Jani Nikula
2023-12-12 21:56 ` kernel test robot
@ 2023-12-13 10:19 ` Jani Nikula
2023-12-14 17:23 ` Thierry Reding
1 sibling, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2023-12-13 10:19 UTC (permalink / raw)
To: Jani Nikula, linux-tegra, dri-devel
Reduce the need for rebuilds when drm_edid.h is modified by including it
only where needed.
v2: Fix build (kernel test robot <lkp@intel.com>)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/tegra/drm.h | 2 +-
drivers/gpu/drm/tegra/output.c | 1 +
drivers/gpu/drm/tegra/sor.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index ccb5d74fa227..682011166a8f 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -13,7 +13,6 @@
#include <drm/drm_atomic.h>
#include <drm/drm_bridge.h>
-#include <drm/drm_edid.h>
#include <drm/drm_encoder.h>
#include <drm/drm_fixed.h>
#include <drm/drm_probe_helper.h>
@@ -26,6 +25,7 @@
/* XXX move to include/uapi/drm/drm_fourcc.h? */
#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT_ULL(22)
+struct edid;
struct reset_control;
struct tegra_drm {
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index dc2dcb5ca1c8..88af956ad0e7 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -8,6 +8,7 @@
#include <linux/of.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_edid.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
#include <drm/drm_simple_kms_helper.h>
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 83341576630d..bad3b8fcc726 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -20,6 +20,7 @@
#include <drm/display/drm_scdc_helper.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h>
+#include <drm/drm_edid.h>
#include <drm/drm_eld.h>
#include <drm/drm_file.h>
#include <drm/drm_panel.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] drm/tegra: include drm/drm_edid.h only where needed
2023-12-13 10:19 ` [PATCH v2] " Jani Nikula
@ 2023-12-14 17:23 ` Thierry Reding
0 siblings, 0 replies; 5+ messages in thread
From: Thierry Reding @ 2023-12-14 17:23 UTC (permalink / raw)
To: Jani Nikula; +Cc: linux-tegra, dri-devel
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
On Wed, Dec 13, 2023 at 12:19:51PM +0200, Jani Nikula wrote:
> Reduce the need for rebuilds when drm_edid.h is modified by including it
> only where needed.
>
> v2: Fix build (kernel test robot <lkp@intel.com>)
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/tegra/drm.h | 2 +-
> drivers/gpu/drm/tegra/output.c | 1 +
> drivers/gpu/drm/tegra/sor.c | 1 +
> 3 files changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-14 17:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-12 14:24 [PATCH] drm/tegra: include drm/drm_edid.h only where needed Jani Nikula
2023-12-12 21:56 ` kernel test robot
2023-12-12 21:56 ` kernel test robot
2023-12-13 10:19 ` [PATCH v2] " Jani Nikula
2023-12-14 17:23 ` Thierry Reding
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.